FreeBSD Bugzilla – Attachment 186164 Details for
Bug 222136
[regression] [zlib] [patch] embedded Tomcat web server gzip compression broken after latest zlib import
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
upstream fix for deflate.c
deflate.c.diff (text/plain), 932 bytes, created by
Eugene Grosbein
on 2017-09-08 10:29:38 UTC
(
hide
)
Description:
upstream fix for deflate.c
Filename:
MIME Type:
Creator:
Eugene Grosbein
Created:
2017-09-08 10:29:38 UTC
Size:
932 bytes
patch
obsolete
>--- contrib/zlib/deflate.c.orig 2017-07-24 16:36:51.474963000 +0700 >+++ contrib/zlib/deflate.c 2017-09-08 17:12:26.235597000 +0700 >@@ -494,7 +494,7 @@ int ZEXPORT deflateResetKeep (strm) > s->wrap == 2 ? crc32(0L, Z_NULL, 0) : > #endif > adler32(0L, Z_NULL, 0); >- s->last_flush = Z_NO_FLUSH; >+ s->last_flush = -2; > > _tr_init(s); > >@@ -587,12 +587,12 @@ int ZEXPORT deflateParams(strm, level, s > func = configuration_table[s->level].func; > > if ((strategy != s->strategy || func != configuration_table[level].func) && >- s->high_water) { >+ s->last_flush != -2) { > /* Flush the last buffer: */ > int err = deflate(strm, Z_BLOCK); > if (err == Z_STREAM_ERROR) > return err; >- if (strm->avail_out == 0) >+ if (strm->avail_in || (s->strstart - s->block_start) + s->lookahead) > return Z_BUF_ERROR; > } > if (s->level != level) {
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=186164">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 222136
: 186164