kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(docker) build docker container with zlib disabled

Browse Source
This commit is contained in:
Benjamin Sergeant
2020-11-07 11:22:52 -08:00
parent 6a90dc7259
commit 51ec32405d
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/CHANGELOG.md
View File

@@ -2,6 +2,10 @@
All changes to this project will be documented in this file. 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 ## [10.5.6] - 2020-11-07
(cmake) DEFLATE -> Deflate in CMake to stop warnings about casing (cmake) DEFLATE -> Deflate in CMake to stop warnings about casing

14
ixwebsocket/IXGzipCodec.cpp
View File

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

2
ixwebsocket/IXWebSocketVersion.h
View File

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

2
makefile
View File

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