-
Bug
-
Resolution: Fixed
-
P2
-
7u351, 8u341, 11.0.16-oracle, 17.0.4-oracle, 19
-
b35
Issue | Fix Version | Assignee | Priority | Status | Resolution | Resolved In Build |
---|---|---|---|---|---|---|
JDK-8292229 | 20 | Lance Andersen | P2 | Resolved | Fixed | b11 |
JDK-8292517 | 19.0.2 | Lance Andersen | P2 | Resolved | Fixed | b01 |
JDK-8292502 | 19.0.1 | Lance Andersen | P2 | Resolved | Fixed | b07 |
As part of the fix for JDK-8284371, there was an unintentional change which reverted the reworking of (7) deflate.c undo (6), replaced withe the official zlib repo fix see#305/#f969409
This patch restores that change which is:
git diff
diff --git a/src/java.base/share/native/libzip/zlib/deflate.c b/src/java.base/share/native/libzip/zlib/deflate.c
index ba1f386e5fc..2b80a735886 100644
--- a/src/java.base/share/native/libzip/zlib/deflate.c
+++ b/src/java.base/share/native/libzip/zlib/deflate.c
@@ -555,7 +555,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);
@@ -649,7 +649,7 @@ int ZEXPORT deflateParams(strm, level, strategy)
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)
%
This patch restores that change which is:
git diff
diff --git a/src/java.base/share/native/libzip/zlib/deflate.c b/src/java.base/share/native/libzip/zlib/deflate.c
index ba1f386e5fc..2b80a735886 100644
--- a/src/java.base/share/native/libzip/zlib/deflate.c
+++ b/src/java.base/share/native/libzip/zlib/deflate.c
@@ -555,7 +555,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);
@@ -649,7 +649,7 @@ int ZEXPORT deflateParams(strm, level, strategy)
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)
%
- backported by
-
JDK-8292229 Revert unintentional change to deflate.c
-
- Resolved
-
-
JDK-8292502 Revert unintentional change to deflate.c
-
- Resolved
-
-
JDK-8292517 Revert unintentional change to deflate.c
-
- Resolved
-
- relates to
-
JDK-8292139 Revisit the changes to deflate.c/deleteParams from JDK-8191918
-
- Closed
-
(1 links to)