diff --git a/README.md b/README.md index 314bbf2e..dab9b537 100644 --- a/README.md +++ b/README.md @@ -199,6 +199,8 @@ make install # will install to /usr/local on Unix, on macOS it is a good idea to Headers and a static library will be installed to the target dir. +A [conan](https://conan.io/) file is available at [conan-IXWebSocket](https://github.com/Zinnion/conan-IXWebSocket). + There is a unittest which can be executed by typing `make test`. There is a Dockerfile for running some code on Linux. To use docker-compose you must make a docker container first. diff --git a/ixwebsocket/IXDNSLookup.cpp b/ixwebsocket/IXDNSLookup.cpp index 40f91097..139ab4be 100644 --- a/ixwebsocket/IXDNSLookup.cpp +++ b/ixwebsocket/IXDNSLookup.cpp @@ -35,7 +35,6 @@ namespace ix _activeJobs.erase(_id); } - // we want hostname to be copied, not passed as a const reference struct addrinfo* DNSLookup::getAddrInfo(const std::string& hostname, int port, std::string& errMsg) diff --git a/ixwebsocket/IXWebSocket.cpp b/ixwebsocket/IXWebSocket.cpp index 9e1ab740..7b140213 100644 --- a/ixwebsocket/IXWebSocket.cpp +++ b/ixwebsocket/IXWebSocket.cpp @@ -270,7 +270,7 @@ namespace ix _onMessageCallback(WebSocket_MessageType_Error, "", 0, connectErr, WebSocketOpenInfo(), WebSocketCloseInfo()); - + // Only sleep if we aren't in the middle of stopping if (!_stop) {