aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-11-10 15:41:10 +0100
committerIngela Anderton Andin <[email protected]>2017-11-10 15:41:10 +0100
commit50e7caee08df7923a9a0b044660a504d5f6311bc (patch)
treee0e791ca688d76eadcd85de7970b745edbd50014 /erts/preloaded/src
parent494724da87d40c1f083be9451e5098ae2fb89759 (diff)
parent3fb3067d953f8be9fe66d3a6687a86be2e8d2f3f (diff)
downloadotp-50e7caee08df7923a9a0b044660a504d5f6311bc.tar.gz
otp-50e7caee08df7923a9a0b044660a504d5f6311bc.tar.bz2
otp-50e7caee08df7923a9a0b044660a504d5f6311bc.zip
Merge branch 'maint'
* maint: Updated OTP version Update release notes Update version numbers inets: Prepare for release inets: Add missing guard Avoid WindowBits=8 as per the manual Fix deflateParams on zlib 1.2.11 Ignore empty binaries in enif_inspect_iovec Emasculate writable binaries on entering an iovec Only apply EOS behaviors if there's pending data Conflicts: OTP_VERSION
Diffstat (limited to 'erts/preloaded/src')
-rw-r--r--erts/preloaded/src/zlib.erl13
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).