From 51ec32405de14d447a70c6f345f61cf18196083e Mon Sep 17 00:00:00 2001
From: Benjamin Sergeant <bsergean@gmail.com>
Date: Sat, 7 Nov 2020 11:22:52 -0800
Subject: [PATCH] (docker) build docker container with zlib disabled

---
 docs/CHANGELOG.md                |  4 ++++
 ixwebsocket/IXGzipCodec.cpp      | 14 ++++++++++----
 ixwebsocket/IXWebSocketVersion.h |  2 +-
 makefile                         |  2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 7ed2eb04..7cb10ddb 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 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
diff --git a/ixwebsocket/IXGzipCodec.cpp b/ixwebsocket/IXGzipCodec.cpp
index 8e3a153c..fe59bd65 100644
--- a/ixwebsocket/IXGzipCodec.cpp
+++ b/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
diff --git a/ixwebsocket/IXWebSocketVersion.h b/ixwebsocket/IXWebSocketVersion.h
index 691201a6..f00f2b40 100644
--- a/ixwebsocket/IXWebSocketVersion.h
+++ b/ixwebsocket/IXWebSocketVersion.h
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define IX_WEBSOCKET_VERSION "10.5.6"
+#define IX_WEBSOCKET_VERSION "10.5.7"
diff --git a/makefile b/makefile
index b1a730a4..b0837b24 100644
--- a/makefile
+++ b/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)