Skip to content

Commit 0c13d66

Browse files
author
Lance Andersen
committedOct 21, 2022
8295530: Update Zlib Data Compression Library to Version 1.2.13
Reviewed-by: alanb, jpai
·
jdk-25+14jdk-20-ga
1 parent 15bebf9 commit 0c13d66

24 files changed

+10923
-1222
lines changed
 

‎src/java.base/share/legal/zlib.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
## zlib v1.2.11
1+
## zlib v1.2.13
22

33
### zlib License
44
<pre>
55

6-
Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
6+
Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
77

88
This software is provided 'as-is', without any express or implied
99
warranty. In no event will the authors be held liable for any damages

‎src/java.base/share/native/libzip/zlib/README

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
ZLIB DATA COMPRESSION LIBRARY
22

3-
zlib 1.2.11 is a general purpose data compression library. All the code is
3+
zlib 1.2.13 is a general purpose data compression library. All the code is
44
thread safe. The data format used by the zlib library is described by RFCs
55
(Request for Comments) 1950 to 1952 in the files
6-
https://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
6+
http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
77
rfc1952 (gzip format).
88

99
All functions of the compression library are documented in the file zlib.h
@@ -31,7 +31,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
3131
issue of Dr. Dobb's Journal; a copy of the article is available at
3232
http://marknelson.us/1997/01/01/zlib-engine/ .
3333

34-
The changes made in version 1.2.11 are documented in the file ChangeLog.
34+
The changes made in version 1.2.13 are documented in the file ChangeLog.
3535

3636
Unsupported third party contributions are provided in directory contrib/ .
3737

@@ -84,7 +84,7 @@ Acknowledgments:
8484

8585
Copyright notice:
8686

87-
(C) 1995-2017 Jean-loup Gailly and Mark Adler
87+
(C) 1995-2022 Jean-loup Gailly and Mark Adler
8888

8989
This software is provided 'as-is', without any express or implied
9090
warranty. In no event will the authors be held liable for any damages
@@ -108,7 +108,10 @@ Copyright notice:
108108
If you use the zlib library in a product, we would appreciate *not* receiving
109109
lengthy legal documents to sign. The sources are provided for free but without
110110
warranty of any kind. The library has been entirely written by Jean-loup
111-
Gailly and Mark Adler; it does not include third-party code.
111+
Gailly and Mark Adler; it does not include third-party code. We make all
112+
contributions to and distributions of this project solely in our personal
113+
capacity, and are not conveying any rights to any intellectual property of
114+
any third parties.
112115

113116
If you redistribute modified sources, we would appreciate that you include in
114117
the file ChangeLog history information documenting your changes. Please read

‎src/java.base/share/native/libzip/zlib/compress.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
memory, Z_BUF_ERROR if there was not enough room in the output buffer,
4444
Z_STREAM_ERROR if the level parameter is invalid.
4545
*/
46-
int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
46+
int ZEXPORT compress2(dest, destLen, source, sourceLen, level)
4747
Bytef *dest;
4848
uLongf *destLen;
4949
const Bytef *source;
@@ -89,7 +89,7 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
8989

9090
/* ===========================================================================
9191
*/
92-
int ZEXPORT compress (dest, destLen, source, sourceLen)
92+
int ZEXPORT compress(dest, destLen, source, sourceLen)
9393
Bytef *dest;
9494
uLongf *destLen;
9595
const Bytef *source;
@@ -102,7 +102,7 @@ int ZEXPORT compress (dest, destLen, source, sourceLen)
102102
If the default memLevel or windowBits for deflateInit() is changed, then
103103
this function needs to be updated.
104104
*/
105-
uLong ZEXPORT compressBound (sourceLen)
105+
uLong ZEXPORT compressBound(sourceLen)
106106
uLong sourceLen;
107107
{
108108
return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +

‎src/java.base/share/native/libzip/zlib/crc32.h

+9,441-436
Large diffs are not rendered by default.

3 commit comments

Comments
 (3)

openjdk-notifier[bot] commented on Oct 21, 2022

@openjdk-notifier[bot]
openjdk-notifier[bot]
on Oct 21, 2022

Review

Issues

GoeLin commented on Dec 23, 2022

@GoeLin
GoeLin
on Dec 23, 2022
Member

/backport jdk17u-dev

openjdk[bot] commented on Dec 23, 2022

@openjdk[bot]
openjdk[bot]
on Dec 23, 2022

@GoeLin the backport was successfully created on the branch GoeLin-backport-0c13d666 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 0c13d666 from the openjdk/jdk repository.

The commit being backported was authored by Lance Andersen on 21 Oct 2022 and was reviewed by Alan Bateman and Jaikiran Pai.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev GoeLin-backport-0c13d666:GoeLin-backport-0c13d666
$ git checkout GoeLin-backport-0c13d666
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev GoeLin-backport-0c13d666
Please sign in to comment.