[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 32/163: content_encoding: handle zlib versions too
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 32/163: content_encoding: handle zlib versions too old for Z_BLOCK |
Date: |
Sun, 05 Aug 2018 12:35:58 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit d0f1d6c8fa08a55a61186b836024a1b8537badbc
Author: Alejandro R. SedeƱo <address@hidden>
AuthorDate: Thu May 24 22:08:04 2018 -0400
content_encoding: handle zlib versions too old for Z_BLOCK
Fallback on Z_SYNC_FLUSH when Z_BLOCK is not available.
Fixes #2606
Closes #2608
---
lib/content_encoding.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/lib/content_encoding.c b/lib/content_encoding.c
index 7c979efcc..b1c5b5012 100644
--- a/lib/content_encoding.c
+++ b/lib/content_encoding.c
@@ -190,7 +190,13 @@ static CURLcode inflate_stream(struct connectdata *conn,
z->next_out = (Bytef *) decomp;
z->avail_out = DSIZ;
+#ifdef Z_BLOCK
+ /* Z_BLOCK is only available in zlib ver. >= 1.2.0.5 */
status = inflate(z, Z_BLOCK);
+#else
+ /* fallback for zlib ver. < 1.2.0.5 */
+ status = inflate(z, Z_SYNC_FLUSH);
+#endif
/* Flush output data if some. */
if(z->avail_out != DSIZ) {
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 22/163: CURLOPT_ACCEPT_ENCODING.3: add brotli and clarify a bit, (continued)
- [GNUnet-SVN] [gnurl] 22/163: CURLOPT_ACCEPT_ENCODING.3: add brotli and clarify a bit, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 11/163: docs: mention HAproxy protocol "version 1", gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 16/163: configure: compile-time SIZEOF checks, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 34/163: winbuild: In MakefileBuild.vc fix typo DISTDIR->DIRDIST, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 18/163: curl: added --styled-output, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 14/163: docs: clarify CURLOPT_HTTPGET somewhat, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 24/163: configure: add missing m4/ax_compile_check_sizeof.m4, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 21/163: RELEASE-NOTES: synced, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 28/163: cmake: set -d postfix for debug builds if not specified using -DCMAKE_DEBUG_POSTFIX explicitly, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 53/163: os400: sync EBCDIC wrappers and ILE/RPG binding with latest options, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 32/163: content_encoding: handle zlib versions too old for Z_BLOCK,
gnunet <=
- [GNUnet-SVN] [gnurl] 38/163: mailmap: Max Savenkov, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 31/163: multi: provide a socket to wait for in Curl_protocol_getsock, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 41/163: cmdline-opts/gen.pl: warn if mutexes: or see-also: list non-existing options, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 44/163: configure: fix ssh2 linking when built with a static mbedtls, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 67/163: curl_addrinfo: use same #ifdef conditions in source as header, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 33/163: winbuild: only delete OUTFILE if it exists, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 36/163: mailmap: a Richard Alcock fixup, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 17/163: curl: show headers in bold, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 19/163: checksrc: make sure sizeof() is used *with* parentheses, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 27/163: configure: add basic test of --with-ssl prefix, gnunet, 2018/08/05