Release v11.4.5

CMakeLists.txt

@@ -6,13 +6,15 @@
 cmake_minimum_required(VERSION 3.4.1...3.17.2)
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake;${CMAKE_MODULE_PATH}")
 
-project(ixwebsocket LANGUAGES C CXX VERSION 11.4.4)
+project(ixwebsocket LANGUAGES C CXX VERSION 11.4.5)
 
 set (CMAKE_CXX_STANDARD 11)
 set (CXX_STANDARD_REQUIRED ON)
 set (CMAKE_CXX_EXTENSIONS OFF)
 set (CMAKE_EXPORT_COMPILE_COMMANDS yes)
 
+add_compile_definitions(IX_WEBSOCKET_VERSION="${CMAKE_PROJECT_VERSION}")
+
 option (BUILD_DEMO OFF)
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")

ixwebsocket/IXDNSLookup.cpp

@@ -82,7 +82,7 @@ namespace ix
     DNSLookup::AddrInfoPtr DNSLookup::resolveUnCancellable(
         std::string& errMsg, const CancellationRequest& isCancellationRequested)
     {
-        errMsg = "no error";
+        errMsg = "unknown error";
 
         // Maybe a cancellation request got in before the background thread terminated ?
         if (isCancellationRequested())
@@ -97,12 +97,13 @@ namespace ix
     DNSLookup::AddrInfoPtr DNSLookup::resolveCancellable(
         std::string& errMsg, const CancellationRequest& isCancellationRequested)
     {
-        errMsg = "no error";
+        errMsg = "unknown error";
 
         // Can only be called once, otherwise we would have to manage a pool
         // of background thread which is overkill for our usage.
         if (_done)
         {
+            errMsg = "programming error";
             return nullptr; // programming error, create a second DNSLookup instance
                             // if you need a second lookup.
         }
@@ -156,7 +157,7 @@ namespace ix
         // We don't want to read or write into members variables of an object that could be
         // gone, so we use temporary variables (res) or we pass in by copy everything that
         // getAddrInfo needs to work.
-        std::string errMsg;
+        std::string errMsg = "unknown error";
         auto res = getAddrInfo(hostname, port, errMsg);
 
         if (auto lock = self.lock())

ixwebsocket/IXSocketConnect.cpp

@@ -34,7 +34,7 @@ namespace ix
                                         std::string& errMsg,
                                         const CancellationRequest& isCancellationRequested)
     {
-        errMsg = "no error";
+        errMsg = "unknown error";
 
         socket_t fd = socket(address->ai_family, address->ai_socktype, address->ai_protocol);
         if (fd < 0)

ixwebsocket/IXSocketOpenSSL.cpp

@@ -292,6 +292,8 @@ namespace ix
     /**
      * Check whether a hostname matches a pattern
      */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
     bool SocketOpenSSL::checkHost(const std::string& host, const char* pattern)
     {
 #if OPENSSL_VERSION_NUMBER >= 0x10100000L
@@ -306,6 +308,7 @@ namespace ix
 
 #endif
     }
+#pragma GCC diagnostic pop
 
     bool SocketOpenSSL::openSSLCheckServerCert(SSL* ssl,
 #if OPENSSL_VERSION_NUMBER < 0x10100000L

ixwebsocket/IXWebSocketVersion.h

@@ -6,4 +6,6 @@
 
 #pragma once
 
-#define IX_WEBSOCKET_VERSION "11.4.4"
+#ifndef IX_WEBSOCKET_VERSION
+#define IX_WEBSOCKET_VERSION "unknown"
+#endif