From ff05be32af044ed5de22cb642192ceefa640158c Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Sun, 9 Jul 2017 13:17:12 -0700 Subject: [PATCH] Fix warning in zlib --- CHANGELOG.md | 1 + include/beast/zlib/detail/deflate_stream.hpp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a36e22a0..9fb78681 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ Version 78: * Add span * Documentation work * Use make_unique_noinit +* Fix warning in zlib HTTP: diff --git a/include/beast/zlib/detail/deflate_stream.hpp b/include/beast/zlib/detail/deflate_stream.hpp index 9ec35be7..b51baff1 100644 --- a/include/beast/zlib/detail/deflate_stream.hpp +++ b/include/beast/zlib/detail/deflate_stream.hpp @@ -1059,8 +1059,9 @@ doWrite(z_params& zs, boost::optional flush, error_code& ec) return; } } - else if(zs.avail_in == 0 && flush <= old_flush && - flush != Flush::finish) + else if(zs.avail_in == 0 && ( + old_flush && flush <= *old_flush + ) && flush != Flush::finish) { /* Make sure there is something to do and avoid duplicate consecutive * flushes. For repeated and useless calls with Flush::finish, we keep