(docker) build docker container with zlib disabled

CMake/FindDeflate.cmake

@@ -5,7 +5,7 @@ include(FindPackageHandleStandardArgs)
 find_path(DEFLATE_INCLUDE_DIRS libdeflate.h)
 find_library(DEFLATE_LIBRARY deflate)
 
-find_package_handle_standard_args(DEFLATE
+find_package_handle_standard_args(Deflate
     FOUND_VAR
       DEFLATE_FOUND
     REQUIRED_VARS

CMakeLists.txt

@@ -203,7 +203,7 @@ if (USE_ZLIB)
 endif()
 
 # brew install libdeflate
-find_package(DEFLATE)
+find_package(Deflate)
 if (DEFLATE_FOUND)
   include_directories(${DEFLATE_INCLUDE_DIRS})
   target_link_libraries(ixwebsocket ${DEFLATE_LIBRARIES})

docs/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All changes to this project will be documented in this file.
 
+## [10.5.7] - 2020-11-07
+
+(docker) build docker container with zlib disabled
+
+## [10.5.6] - 2020-11-07
+
+(cmake) DEFLATE -> Deflate in CMake to stop warnings about casing
+
 ## [10.5.5] - 2020-11-07
 
 (ws autoroute) Display result in compliant way (AUTOROUTE IXWebSocket :: N ms) so that result can be parsed easily

ixwebsocket/IXGzipCodec.cpp

@@ -20,9 +20,11 @@
 
 namespace ix
 {
-#ifdef IXWEBSOCKET_USE_ZLIB
     std::string gzipCompress(const std::string& str)
     {
+#ifndef IXWEBSOCKET_USE_ZLIB
+        return std::string();
+#else
 #ifdef IXWEBSOCKET_USE_DEFLATE
         int compressionLevel = 6;
         struct libdeflate_compressor* compressor;
@@ -99,7 +101,8 @@ namespace ix
         deflateEnd(&zs);
 
         return outstring;
-#endif
+#endif // IXWEBSOCKET_USE_DEFLATE
+#endif // IXWEBSOCKET_USE_ZLIB
     }
 
 #ifdef IXWEBSOCKET_USE_DEFLATE
@@ -112,6 +115,9 @@ namespace ix
 
     bool gzipDecompress(const std::string& in, std::string& out)
     {
+#ifndef IXWEBSOCKET_USE_ZLIB
+        return false;
+#else
 #ifdef IXWEBSOCKET_USE_DEFLATE
         struct libdeflate_decompressor* decompressor;
         decompressor = libdeflate_alloc_decompressor();
@@ -171,7 +177,7 @@ namespace ix
 
         inflateEnd(&inflateState);
         return true;
-#endif
+#endif // IXWEBSOCKET_USE_DEFLATE
+#endif // IXWEBSOCKET_USE_ZLIB
     }
-#endif
 } // namespace ix

ixwebsocket/IXWebSocketVersion.h

@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define IX_WEBSOCKET_VERSION "10.5.5"
+#define IX_WEBSOCKET_VERSION "10.5.7"

makefile

@@ -28,7 +28,7 @@ brew:
 # server side ?) and I can't work-around it easily, so we're using mbedtls on
 # Linux for the SSL backend, which works great.
 ws_mbedtls_install:
-	mkdir -p build && (cd build ; cmake -GNinja -DCMAKE_BUILD_TYPE=MinSizeRel -DUSE_PYTHON=1 -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 .. ; ninja install)
+	mkdir -p build && (cd build ; cmake -GNinja -DCMAKE_BUILD_TYPE=MinSizeRel -DUSE_ZLIB=OFF -DUSE_PYTHON=1 -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 .. ; ninja install)
 
 ws:
 	mkdir -p build && (cd build ; cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DUSE_PYTHON=1 -DUSE_TLS=1 -DUSE_WS=1 .. && ninja install)