diff --git a/DOCKER_VERSION b/DOCKER_VERSION index 815da58b..f8cb1fa1 100644 --- a/DOCKER_VERSION +++ b/DOCKER_VERSION @@ -1 +1 @@ -7.4.1 +7.4.2 diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 9414594a..3d5e89ae 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog All notable changes to this project will be documented in this file. +## [7.4.2] - 2019-12-02 + +- (client) internal IXDNSLookup class requires a valid cancellation request function callback to be passed in + ## [7.4.1] - 2019-12-02 - (client) fix an overflow in the exponential back off code diff --git a/ixsnake/ixsnake/IXRedisClient.cpp b/ixsnake/ixsnake/IXRedisClient.cpp index 754041d8..afb6d6a8 100644 --- a/ixsnake/ixsnake/IXRedisClient.cpp +++ b/ixsnake/ixsnake/IXRedisClient.cpp @@ -29,8 +29,13 @@ namespace ix return false; } + CancellationRequest cancellationRequest = []() -> bool + { + return false; + }; + std::string errMsg; - return _socket->connect(hostname, port, errMsg, nullptr); + return _socket->connect(hostname, port, errMsg, cancellationRequest); } void RedisClient::stop() diff --git a/ixwebsocket/IXDNSLookup.cpp b/ixwebsocket/IXDNSLookup.cpp index ccf3f0bb..9114c10a 100644 --- a/ixwebsocket/IXDNSLookup.cpp +++ b/ixwebsocket/IXDNSLookup.cpp @@ -61,7 +61,7 @@ namespace ix errMsg = "no error"; // Maybe a cancellation request got in before the background thread terminated ? - if (isCancellationRequested && isCancellationRequested()) + if (isCancellationRequested()) { errMsg = "cancellation requested"; return nullptr; @@ -107,7 +107,7 @@ namespace ix std::this_thread::sleep_for(std::chrono::milliseconds(_wait)); // Were we cancelled ? - if (isCancellationRequested && isCancellationRequested()) + if (isCancellationRequested()) { errMsg = "cancellation requested"; return nullptr; @@ -115,7 +115,7 @@ namespace ix } // Maybe a cancellation request got in before the bg terminated ? - if (isCancellationRequested && isCancellationRequested()) + if (isCancellationRequested()) { errMsg = "cancellation requested"; return nullptr; diff --git a/ixwebsocket/IXWebSocketVersion.h b/ixwebsocket/IXWebSocketVersion.h index 231b91e7..3dc24b96 100644 --- a/ixwebsocket/IXWebSocketVersion.h +++ b/ixwebsocket/IXWebSocketVersion.h @@ -6,4 +6,4 @@ #pragma once -#define IX_WEBSOCKET_VERSION "7.4.1" +#define IX_WEBSOCKET_VERSION "7.4.2"