Skip to content

zlib: use Z_DEFAULT_STRATEGY by default instead of Z_FIXED #10676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 3 commits into from
Apr 8, 2020
Merged

zlib: use Z_DEFAULT_STRATEGY by default instead of Z_FIXED #10676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03aa107
zlib: use Z_DEFAULT_STRATEGY by default instead of Z_FIXED
Apr 7, 2020
491689a
use zlib's defines instead of magic numbers
Apr 8, 2020
66a89f6
add a release note
Apr 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/root/intro/version_history.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ Version history
restart Envoy. The behavior will not switch until the connection pools are recreated. The new
circuit breaker behavior is described :ref:`here <arch_overview_circuit_break>`.
* upstream: changed load distribution algorithm when all priorities enter :ref:`panic mode<arch_overview_load_balancing_panic_threshold>`.
* zlib: by default zlib is initialized to use its default strategy (Z_DEFAULT_STRATEGY)
instead of the fixed one (Z_FIXED). The difference is that the use of dynammic
Copy link
Member

@mattklein123 mattklein123 Apr 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note to self: typo "dynammic". I will fix this when I do the release cleanup.

Huffman codes is enabled now resulting in better compression ratio for normal data.

1.13.1 (March 3, 2020)
======================
Expand Down
14 changes: 7 additions & 7 deletions source/common/compressor/zlib_compressor_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ class ZlibCompressorImpl : public Zlib::Base, public Compressor {
* manual.
*/
enum class CompressionLevel : int64_t {
Best = 9,
Speed = 1,
Standard = -1,
Best = Z_BEST_COMPRESSION,
Speed = Z_BEST_SPEED,
Standard = Z_DEFAULT_COMPRESSION,
};

/**
Expand All @@ -47,10 +47,10 @@ class ZlibCompressorImpl : public Zlib::Base, public Compressor {
* standard: used for normal data. (default) @see Z_DEFAULT_STRATEGY in zlib manual.
*/
enum class CompressionStrategy : uint64_t {
Filtered = 1,
Huffman = 2,
Rle = 3,
Standard = 4,
Filtered = Z_FILTERED,
Huffman = Z_HUFFMAN_ONLY,
Rle = Z_RLE,
Standard = Z_DEFAULT_STRATEGY,
};

/**
Expand Down