File tree Expand file tree Collapse file tree 2 files changed +14
-11
lines changed
tests/functional/http/client Expand file tree Collapse file tree 2 files changed +14
-11
lines changed Original file line number Diff line number Diff line change 17
17
// it. CPPREST_EXCLUDE_BROTLI is set if we want to explicitly disable Brotli compression support.
18
18
// CPPREST_EXCLUDE_WEBSOCKETS is a flag that now essentially means "no external dependencies". TODO: Rename
19
19
20
- #if __APPLE__
21
- #include " TargetConditionals.h"
22
- #if defined(TARGET_OS_MAC)
23
- #if !defined(CPPREST_EXCLUDE_COMPRESSION)
24
- #define CPPREST_HTTP_COMPRESSION
25
- #endif // !defined(CPPREST_EXCLUDE_COMPRESSION)
26
- #endif // defined(TARGET_OS_MAC)
27
- #elif defined(_WIN32) && (!defined(WINAPI_FAMILY) || WINAPI_PARTITION_DESKTOP)
28
20
#if !defined(CPPREST_EXCLUDE_WEBSOCKETS) && !defined(CPPREST_EXCLUDE_COMPRESSION)
29
21
#define CPPREST_HTTP_COMPRESSION
30
22
#endif // !defined(CPPREST_EXCLUDE_WEBSOCKETS) && !defined(CPPREST_EXCLUDE_COMPRESSION)
31
- #endif
32
23
33
24
#if defined(CPPREST_HTTP_COMPRESSION)
34
25
#include < zlib.h>
@@ -277,7 +268,7 @@ class gzip_compressor : public zlib_compressor_base
277
268
class gzip_decompressor : public zlib_decompressor_base
278
269
{
279
270
public:
280
- gzip_decompressor () : zlib_decompressor_base(16 ) // gzip auto-detect
271
+ gzip_decompressor () : zlib_decompressor_base(31 ) // 15 is MAX_WBITS in zconf.h; add 16 for gzip
281
272
{
282
273
}
283
274
};
Original file line number Diff line number Diff line change @@ -376,19 +376,31 @@ SUITE(compression_tests)
376
376
}
377
377
}
378
378
379
- TEST_FIXTURE (uri_address, compress_and_decompress )
379
+ TEST_FIXTURE (uri_address, compress_and_decompress_fake )
380
380
{
381
381
compress_test (nullptr , nullptr ); // FAKE
382
+ }
383
+
384
+ TEST_FIXTURE (uri_address, compress_and_decompress_gzip)
385
+ {
382
386
if (builtin::algorithm::supported (builtin::algorithm::GZIP))
383
387
{
384
388
compress_test (builtin::get_compress_factory (builtin::algorithm::GZIP),
385
389
builtin::get_decompress_factory (builtin::algorithm::GZIP));
386
390
}
391
+ }
392
+
393
+ TEST_FIXTURE (uri_address, compress_and_decompress_deflate)
394
+ {
387
395
if (builtin::algorithm::supported (builtin::algorithm::DEFLATE))
388
396
{
389
397
compress_test (builtin::get_compress_factory (builtin::algorithm::DEFLATE),
390
398
builtin::get_decompress_factory (builtin::algorithm::DEFLATE));
391
399
}
400
+ }
401
+
402
+ TEST_FIXTURE (uri_address, compress_and_decompress_brotli)
403
+ {
392
404
if (builtin::algorithm::supported (builtin::algorithm::BROTLI))
393
405
{
394
406
compress_test (builtin::get_compress_factory (builtin::algorithm::BROTLI),
You can’t perform that action at this time.
0 commit comments