diff options
author | Erlang/OTP <[email protected]> | 2017-11-09 16:15:40 +0100 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2017-11-09 16:15:40 +0100 |
commit | edfbdc2ab46b44d83da7e3de2ae601055a3bcc2f (patch) | |
tree | 6fd54f81f11f9335eb69026d3b3e8632ce17fb73 /erts/preloaded/src/zlib.erl | |
parent | 3e8c1ff94c0a73df71daadd4eb782c21c49f22d9 (diff) | |
parent | e96969083dbfebfaaa600d2ba6c2cf6d5a690cbe (diff) | |
download | otp-edfbdc2ab46b44d83da7e3de2ae601055a3bcc2f.tar.gz otp-edfbdc2ab46b44d83da7e3de2ae601055a3bcc2f.tar.bz2 otp-edfbdc2ab46b44d83da7e3de2ae601055a3bcc2f.zip |
Merge branch 'john/erts/zlib-1.2.11-fixes/OTP-14751' into maint-20
* john/erts/zlib-1.2.11-fixes/OTP-14751:
Avoid WindowBits=8 as per the manual
Fix deflateParams on zlib 1.2.11
Diffstat (limited to 'erts/preloaded/src/zlib.erl')
-rw-r--r-- | erts/preloaded/src/zlib.erl | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/erts/preloaded/src/zlib.erl b/erts/preloaded/src/zlib.erl index 03c9ae38a1..a4ef42204d 100644 --- a/erts/preloaded/src/zlib.erl +++ b/erts/preloaded/src/zlib.erl @@ -188,14 +188,13 @@ deflateReset_nif(_Z) -> deflateParams(Z, Level0, Strategy0) -> Level = arg_level(Level0), Strategy = arg_strategy(Strategy0), + Progress = deflate(Z, <<>>, sync), case deflateParams_nif(Z, Level, Strategy) of - buf_error -> - %% We had data left in the pipe; flush everything and stash it away - %% for the next deflate call before trying again. - Output = deflate(Z, <<>>, full), - save_progress(Z, deflate, Output), - deflateParams_nif(Z, Level, Strategy); - Any -> Any + ok -> + save_progress(Z, deflate, Progress), + ok; + Other -> + Other end. deflateParams_nif(_Z, _Level, _Strategy) -> erlang:nif_error(undef). |