Merge branch 'release/1.1.4'

Tinkoff · Apr 27, 2020 · 52a31d7 · 52a31d7
2 parents 6af7d8e + 228bde2
commit 52a31d7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.1.4 (2020-04-28)
+
+### Bug Fixes
+
+* TCP options not set in base_socket ctor
+
 ## 1.1.3 (2020-03-03)
 
 ### Bug Fixes

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 
 set(STREAMCLIENT_VERSION_MAJOR "1")
 set(STREAMCLIENT_VERSION_MINOR "1")
-set(STREAMCLIENT_VERSION_RELEASE "3")
+set(STREAMCLIENT_VERSION_RELEASE "4")
 set(STREAMCLIENT_VERSION_STRING "${STREAMCLIENT_VERSION_MAJOR}.${STREAMCLIENT_VERSION_MINOR}.${STREAMCLIENT_VERSION_RELEASE}")
 set(STREAMCLIENT_LIB_VERSION ${STREAMCLIENT_VERSION_STRING})
 mark_as_advanced(STREAMCLIENT_VERSION_MAJOR STREAMCLIENT_VERSION_MINOR STREAMCLIENT_VERSION_RELEASE STREAMCLIENT_VERSION_STRING STREAMCLIENT_LIB_VERSION)

diff --git a/include/stream-client/stream/impl/base_socket.ipp b/include/stream-client/stream/impl/base_socket.ipp
@@ -36,7 +36,7 @@ base_socket<Socket>::base_socket(const endpoint_type& peer_endpoint, time_durati
     }
 
     set_option(boost::asio::socket_base::keep_alive(true));
-    if (std::is_same<Socket, boost::asio::ip::tcp>::value) {
+    if (std::is_same<protocol_type, boost::asio::ip::tcp>::value) {
         set_option(boost::asio::ip::tcp::no_delay(true));
 #if __linux__
         set_option(boost::asio::detail::socket_option::boolean<IPPROTO_TCP, TCP_QUICKACK>(true));