kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

doc: add reference to the conan file built at https://github.com/Zinnion/conan-IXWebSocket

Browse Source
This commit is contained in:
Benjamin Sergeant 2019-05-01 21:31:32 -07:00
parent 14ec8522ef
commit 5dbc00bbfe
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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. 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 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. There is a Dockerfile for running some code on Linux. To use docker-compose you must make a docker container first.

1
ixwebsocket/IXDNSLookup.cpp
View File

@ -35,7 +35,6 @@ namespace ix
_activeJobs.erase(_id); _activeJobs.erase(_id);
} }
// we want hostname to be copied, not passed as a const reference
struct addrinfo* DNSLookup::getAddrInfo(const std::string& hostname, struct addrinfo* DNSLookup::getAddrInfo(const std::string& hostname,
int port, int port,
std::string& errMsg) std::string& errMsg)

2
ixwebsocket/IXWebSocket.cpp
View File

@ -270,7 +270,7 @@ namespace ix
_onMessageCallback(WebSocket_MessageType_Error, "", 0, _onMessageCallback(WebSocket_MessageType_Error, "", 0,
connectErr, WebSocketOpenInfo(), connectErr, WebSocketOpenInfo(),
WebSocketCloseInfo()); WebSocketCloseInfo());
// Only sleep if we aren't in the middle of stopping // Only sleep if we aren't in the middle of stopping
if (!_stop) if (!_stop)
{ {