Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(216)

Issue 1955383002: Update Zlib to version 1.2.8 (Closed)

Created:
4 years, 7 months ago by jiadong.zhu
Modified:
4 years, 6 months ago
Reviewers:
agl, gavinp, khasim.mohammed
CC:
chromium-reviews
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Update Zlib to version 1.2.8 merge the latest open source zlib into chromium external projects Version 1.2.8 fixes a very rare bug in decompression. All users are encouraged to upgrade immediately. Version 1.2.8 also has these improvements: - Add new inflateGetDictionary() function - Fix bug where gzopen() immediately followed by gzclose() would write an empty file instead of an empty gzip stream. - Fix bug in gzclose() when gzwrite() runs out of memory Version 1.2.7 has many portability improvements over 1.2.6, and has these enhancements: - Fix bug in gzclose_w() when gzwrite() fails to allocate memory - Add "x" (O_EXCL) and "e" (O_CLOEXEC) modes support to gzopen() - Add gzopen_w() in Windows for wide character path names - Fix type mismatch between get_crc_table() and crc_table Version 1.2.6 has many changes over 1.2.5, including these improvements: - gzread() can now read a file that is being written concurrently - gzgetc() is now a macro for increased speed - Added a 'T' option to gzopen() for transparent writing (no compression) - Added deflatePending() to return the amount of pending output - Allow deflateSetDictionary() and inflateSetDictionary() at any time in raw mode - deflatePrime() can now insert bits in the middle of the stream - ./configure now creates a configure.log file with all of the results - Added a ./configure --solo option to compile zlib with no dependency on any libraries - Fixed a problem with large file support macros - Fixed a bug in contrib/puff - Many portability improvements BUG=610615 R=agl@chromium.org R=gavinp@chromium.org Committed: https://crrev.com/a50849ae9ba1b2fad47905db521463b3bf085883 Cr-Commit-Position: refs/heads/master@{#400647}

Patch Set 1 : Update zlib to version 1.2.8 #

Total comments: 6

Patch Set 2 : Update Zlib to version 1.2.8 #

Total comments: 4

Patch Set 3 : seperate and update patches #

Patch Set 4 : Add into author list #

Patch Set 5 : fix mozzdefs issue #

Total comments: 2

Patch Set 6 : Update for deflate issue #

Total comments: 1

Patch Set 7 : modify expect result of spdy zlib cases #

Patch Set 8 : update AUTHORS file #

Patch Set 9 : fix win x64 failure #

Patch Set 10 : fix unzip on win platform #

Unified diffs Side-by-side diffs Delta from patch set Stats (+3135 lines, -1097 lines) Patch
M AUTHORS View 1 2 3 4 5 6 7 8 1 chunk +1 line, -0 lines 0 comments Download
M net/spdy/spdy_framer_test.cc View 1 2 3 4 5 6 7 8 11 chunks +21 lines, -22 lines 0 comments Download
M net/spdy/spdy_session_unittest.cc View 1 2 3 4 5 6 7 8 1 chunk +5 lines, -0 lines 0 comments Download
M third_party/zlib/README.chromium View 1 2 7 8 1 chunk +8 lines, -0 lines 0 comments Download
M third_party/zlib/adler32.c View 5 chunks +39 lines, -29 lines 0 comments Download
M third_party/zlib/compress.c View 1 chunk +1 line, -1 line 0 comments Download
M third_party/zlib/contrib/minizip/crypt.h View 4 chunks +4 lines, -4 lines 0 comments Download
M third_party/zlib/contrib/minizip/ioapi.h View 1 4 chunks +9 lines, -1 line 0 comments Download
M third_party/zlib/contrib/minizip/ioapi.c View 5 chunks +17 lines, -5 lines 0 comments Download
M third_party/zlib/contrib/minizip/iowin32.c View 1 2 3 4 5 6 7 8 9 10 chunks +92 lines, -13 lines 0 comments Download
M third_party/zlib/contrib/minizip/miniunz.c View 1 8 chunks +25 lines, -13 lines 0 comments Download
M third_party/zlib/contrib/minizip/minizip.c View 8 chunks +26 lines, -13 lines 0 comments Download
M third_party/zlib/contrib/minizip/mztools.h View 1 chunk +6 lines, -0 lines 0 comments Download
M third_party/zlib/contrib/minizip/mztools.c View 3 chunks +17 lines, -7 lines 0 comments Download
M third_party/zlib/contrib/minizip/unzip.h View 1 chunk +2 lines, -2 lines 0 comments Download
M third_party/zlib/contrib/minizip/unzip.c View 1 7 chunks +12 lines, -12 lines 0 comments Download
M third_party/zlib/contrib/minizip/zip.c View 7 chunks +9 lines, -6 lines 0 comments Download
M third_party/zlib/crc32.h View 1 chunk +1 line, -1 line 0 comments Download
M third_party/zlib/crc32.c View 14 chunks +33 lines, -50 lines 0 comments Download
M third_party/zlib/deflate.h View 1 2 6 chunks +8 lines, -6 lines 0 comments Download
M third_party/zlib/deflate.c View 1 2 3 4 5 30 chunks +194 lines, -69 lines 0 comments Download
M third_party/zlib/google.patch View 1 2 3 4 7 8 5 chunks +221 lines, -51 lines 0 comments Download
M third_party/zlib/gzguts.h View 6 chunks +90 lines, -13 lines 0 comments Download
M third_party/zlib/gzlib.c View 1 2 18 chunks +147 lines, -52 lines 0 comments Download
M third_party/zlib/gzread.c View 1 2 3 4 22 chunks +190 lines, -245 lines 0 comments Download
M third_party/zlib/gzwrite.c View 20 chunks +121 lines, -75 lines 0 comments Download
M third_party/zlib/infback.c View 4 chunks +12 lines, -4 lines 0 comments Download
M third_party/zlib/inffast.c View 2 chunks +3 lines, -3 lines 0 comments Download
M third_party/zlib/inffixed.h View 1 chunk +3 lines, -3 lines 0 comments Download
M third_party/zlib/inflate.c View 21 chunks +84 lines, -52 lines 0 comments Download
M third_party/zlib/inftrees.c View 6 chunks +15 lines, -39 lines 0 comments Download
M third_party/zlib/mixed-source.patch View 1 2 7 8 24 chunks +28 lines, -26 lines 0 comments Download
M third_party/zlib/mozzconf.h View 1 2 3 4 1 chunk +2 lines, -0 lines 0 comments Download
A third_party/zlib/simd.patch View 1 2 3 4 5 7 8 1 chunk +1198 lines, -0 lines 0 comments Download
M third_party/zlib/trees.c View 11 chunks +18 lines, -36 lines 0 comments Download
M third_party/zlib/uncompr.c View 1 chunk +1 line, -1 line 0 comments Download
M third_party/zlib/zconf.h View 1 11 chunks +142 lines, -59 lines 0 comments Download
M third_party/zlib/zlib.h View 1 33 chunks +273 lines, -112 lines 0 comments Download
M third_party/zlib/zutil.h View 1 10 chunks +41 lines, -62 lines 0 comments Download
M third_party/zlib/zutil.c View 4 chunks +16 lines, -10 lines 0 comments Download

Messages

Total messages: 103 (52 generated)
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1955383002/20001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1955383002/20001
4 years, 7 months ago (2016-05-12 15:17:31 UTC) #6
commit-bot: I haz the power
Dry run: The author jiadong.zhu@linaro.org has not signed Google Contributor License Agreement. Please visit https://cla.developers.google.com ...
4 years, 7 months ago (2016-05-12 15:17:33 UTC) #8
gavinp
Did this build on windows? I think you need to update google.patch, otherwise we're not ...
4 years, 7 months ago (2016-05-12 15:19:30 UTC) #9
gavinp
https://codereview.chromium.org/1955383002/diff/20001/third_party/zlib/gzlib.c File third_party/zlib/gzlib.c (left): https://codereview.chromium.org/1955383002/diff/20001/third_party/zlib/gzlib.c#oldcode8 third_party/zlib/gzlib.c:8: #if defined(_WIN32) && !defined(__BORLANDC__) also: __BORLANDC__, heh heh.
4 years, 7 months ago (2016-05-12 15:23:17 UTC) #10
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1955383002/40001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1955383002/40001
4 years, 7 months ago (2016-05-15 04:15:14 UTC) #17
commit-bot: I haz the power
Dry run: No L-G-T-M from a valid reviewer yet. CQ run can only be started ...
4 years, 7 months ago (2016-05-15 04:15:17 UTC) #19
jiadong.zhu
https://codereview.chromium.org/1955383002/diff/20001/third_party/zlib/gzlib.c File third_party/zlib/gzlib.c (left): https://codereview.chromium.org/1955383002/diff/20001/third_party/zlib/gzlib.c#oldcode8 third_party/zlib/gzlib.c:8: #if defined(_WIN32) && !defined(__BORLANDC__) On 2016/05/12 15:19:29, gavinp wrote: ...
4 years, 7 months ago (2016-05-15 04:16:08 UTC) #20
gavinp
Jiadong, Thanks for the upload. I think we haven't been very disciplined in how we've ...
4 years, 7 months ago (2016-05-17 14:35:30 UTC) #21
gavinp
Two things that make life a lot easier here: Mark Adler and Jim Kukunas both ...
4 years, 7 months ago (2016-05-17 14:40:35 UTC) #22
gavinp
https://codereview.chromium.org/1955383002/diff/40001/third_party/zlib/crc32.c File third_party/zlib/crc32.c (right): https://codereview.chromium.org/1955383002/diff/40001/third_party/zlib/crc32.c#newcode32 third_party/zlib/crc32.c:32: #include "x86.h" On 2016/05/17 14:35:30, gavinp wrote: > Why ...
4 years, 7 months ago (2016-05-17 14:56:41 UTC) #23
gavinp
On 2016/05/17 14:56:41, gavinp wrote: > https://codereview.chromium.org/1955383002/diff/40001/third_party/zlib/crc32.c > File third_party/zlib/crc32.c (right): > > https://codereview.chromium.org/1955383002/diff/40001/third_party/zlib/crc32.c#newcode32 > ...
4 years, 7 months ago (2016-05-23 00:11:08 UTC) #24
jiadong.zhu
On 2016/05/23 00:11:08, gavinp wrote: > On 2016/05/17 14:56:41, gavinp wrote: > > https://codereview.chromium.org/1955383002/diff/40001/third_party/zlib/crc32.c > ...
4 years, 7 months ago (2016-05-23 01:24:05 UTC) #25
jiadong.zhu
separate into 3 patches, please check https://codereview.chromium.org/1955383002/diff/40001/third_party/zlib/contrib/minizip/unzip.c File third_party/zlib/contrib/minizip/unzip.c (right): https://codereview.chromium.org/1955383002/diff/40001/third_party/zlib/contrib/minizip/unzip.c#newcode1707 third_party/zlib/contrib/minizip/unzip.c:1707: On 2016/05/17 14:35:30, ...
4 years, 7 months ago (2016-05-23 09:11:20 UTC) #26
gavinp
lgtm. Thanks!
4 years, 7 months ago (2016-05-23 13:20:46 UTC) #27
gavinp
Jiadong, I just saw you're not yet in AUTHORS. You need to add yourself to ...
4 years, 7 months ago (2016-05-23 13:24:52 UTC) #28
jiadong.zhu
On 2016/05/23 13:24:52, gavinp wrote: > Jiadong, I just saw you're not yet in AUTHORS. ...
4 years, 7 months ago (2016-05-24 01:09:58 UTC) #29
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1955383002/80001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1955383002/80001
4 years, 7 months ago (2016-05-24 13:11:15 UTC) #32
gavinp
On 2016/05/24 01:09:58, jiadong.zhu wrote: > On 2016/05/23 13:24:52, gavinp wrote: > > Jiadong, I ...
4 years, 7 months ago (2016-05-24 13:11:16 UTC) #33
gavinp
On 2016/05/24 13:11:16, gavinp wrote: > On 2016/05/24 01:09:58, jiadong.zhu wrote: > > On 2016/05/23 ...
4 years, 7 months ago (2016-05-24 13:23:05 UTC) #34
commit-bot: I haz the power
Try jobs failed on following builders: chromeos_amd64-generic_chromium_compile_only_ng on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/chromeos_amd64-generic_chromium_compile_only_ng/builds/142293)
4 years, 7 months ago (2016-05-24 13:24:20 UTC) #36
jiadong.zhu
On 2016/05/24 13:23:05, gavinp wrote: > On 2016/05/24 13:11:16, gavinp wrote: > > On 2016/05/24 ...
4 years, 7 months ago (2016-05-25 03:24:09 UTC) #37
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1955383002/100001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1955383002/100001
4 years, 7 months ago (2016-05-25 13:49:40 UTC) #40
commit-bot: I haz the power
Try jobs failed on following builders: linux_chromium_chromeos_ozone_rel_ng on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_chromeos_ozone_rel_ng/builds/175798)
4 years, 7 months ago (2016-05-25 14:14:06 UTC) #42
jiadong.zhu
https://codereview.chromium.org/1955383002/diff/100001/third_party/zlib/deflate.c File third_party/zlib/deflate.c (right): https://codereview.chromium.org/1955383002/diff/100001/third_party/zlib/deflate.c#newcode363 third_party/zlib/deflate.c:363: int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) From debug, I ...
4 years, 7 months ago (2016-05-27 09:19:57 UTC) #43
jiadong.zhu
https://codereview.chromium.org/1955383002/diff/100001/third_party/zlib/deflate.c File third_party/zlib/deflate.c (right): https://codereview.chromium.org/1955383002/diff/100001/third_party/zlib/deflate.c#newcode405 third_party/zlib/deflate.c:405: str = s->strstart; When simd is enabled, 'insert_string' makes ...
4 years, 6 months ago (2016-05-31 11:48:01 UTC) #44
jiadong.zhu
Hi gavin I have updated the patch, please help run the bots again. Thanks. https://codereview.chromium.org/1955383002/diff/120001/third_party/zlib/deflate.c ...
4 years, 6 months ago (2016-06-02 05:03:31 UTC) #45
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1955383002/120001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1955383002/120001
4 years, 6 months ago (2016-06-03 14:36:13 UTC) #47
gavinp
On 2016/06/02 05:03:31, jiadong.zhu wrote: > Hi gavin > I have updated the patch, please ...
4 years, 6 months ago (2016-06-03 14:38:37 UTC) #48
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: linux_chromium_chromeos_ozone_rel_ng on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_chromeos_ozone_rel_ng/builds/180572)
4 years, 6 months ago (2016-06-03 15:02:53 UTC) #50
jiadong.zhu
On 2016/06/03 15:02:53, commit-bot: I haz the power wrote: > Dry run: Try jobs failed ...
4 years, 6 months ago (2016-06-07 12:44:46 UTC) #51
gavinp
On 2016/06/07 12:44:46, jiadong.zhu wrote: > On 2016/06/03 15:02:53, commit-bot: I haz the power wrote: ...
4 years, 6 months ago (2016-06-07 14:12:10 UTC) #52
jiadong.zhu
I modifyed the expected result and run gtest net_unittests successfully on my laptop.
4 years, 6 months ago (2016-06-08 09:16:24 UTC) #54
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1955383002/160001
4 years, 6 months ago (2016-06-10 19:44:58 UTC) #56
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: chromium_presubmit on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presubmit/builds/199058)
4 years, 6 months ago (2016-06-10 19:54:15 UTC) #58
jiadong.zhu
forget to add into AUTHOR list in the latest patch. now it ok.
4 years, 6 months ago (2016-06-11 02:54:42 UTC) #59
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1955383002/180001
4 years, 6 months ago (2016-06-14 13:47:05 UTC) #61
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: win_chromium_x64_rel_ng on tryserver.chromium.win (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_rel_ng/builds/229395)
4 years, 6 months ago (2016-06-14 14:32:38 UTC) #63
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1955383002/180001
4 years, 6 months ago (2016-06-15 04:05:06 UTC) #73
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: win_chromium_rel_ng on tryserver.chromium.win (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_ng/builds/239265)
4 years, 6 months ago (2016-06-15 05:13:42 UTC) #75
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1955383002/180001
4 years, 6 months ago (2016-06-16 18:58:49 UTC) #77
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: ios-device on tryserver.chromium.mac (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device/builds/22143) ios-device-gn on ...
4 years, 6 months ago (2016-06-16 19:02:48 UTC) #79
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1955383002/200001
4 years, 6 months ago (2016-06-17 11:11:45 UTC) #82
commit-bot: I haz the power
Try jobs failed on following builders: win_chromium_x64_rel_ng on tryserver.chromium.win (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_rel_ng/builds/231315)
4 years, 6 months ago (2016-06-17 12:44:45 UTC) #84
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1955383002/200001
4 years, 6 months ago (2016-06-20 01:57:41 UTC) #86
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: linux_chromium_chromeos_rel_ng on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_chromeos_rel_ng/builds/230649)
4 years, 6 months ago (2016-06-20 03:02:17 UTC) #88
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1955383002/220001
4 years, 6 months ago (2016-06-20 09:20:38 UTC) #92
commit-bot: I haz the power
Dry run: This issue passed the CQ dry run.
4 years, 6 months ago (2016-06-20 10:42:12 UTC) #94
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1955383002/220001
4 years, 6 months ago (2016-06-20 10:44:03 UTC) #98
commit-bot: I haz the power
Committed patchset #10 (id:220001)
4 years, 6 months ago (2016-06-20 11:10:07 UTC) #100
commit-bot: I haz the power
Patchset 10 (id:??) landed as https://crrev.com/a50849ae9ba1b2fad47905db521463b3bf085883 Cr-Commit-Position: refs/heads/master@{#400647}
4 years, 6 months ago (2016-06-20 11:12:03 UTC) #102
Jamie Madill
4 years, 6 months ago (2016-06-20 13:57:30 UTC) #103
Message was sent while issue was closed.
A revert of this CL (patchset #10 id:220001) has been created in
https://codereview.chromium.org/2079313002/ by jmadill@chromium.org.

The reason for reverting is: Broke the Windows Debug GPU FYI builder:

https://build.chromium.org/p/chromium.gpu.fyi/builders/GPU%20Win%20Builder%20...

fx_zlib.gzlib.obj : error LNK2005: _gzopen_w already defined in zlib.gzlib.obj

initial\chrome.dll : fatal error LNK1169: one or more multiply defined symbols
found

Possibly because they use shared components with a GYP build..

Powered by Google App Engine
This is Rietveld 408576698