diff options
| author | Hans Nilsson <[email protected]> | 2017-10-03 10:11:19 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-10-03 10:11:19 +0200 |
| commit | 8fb29181bca26c221ca0a3364f71f79d3d3a4db4 (patch) | |
| tree | b8df1dd71275d77f45e513c84306c86fac6f6627 /erts | |
| parent | 237d0c7d230534ef99a11d388ebfd0c1e83af548 (diff) | |
| parent | 69292a11cd4b31fd3ff73b44f28d527f2d16f555 (diff) | |
| download | otp-8fb29181bca26c221ca0a3364f71f79d3d3a4db4.tar.gz otp-8fb29181bca26c221ca0a3364f71f79d3d3a4db4.tar.bz2 otp-8fb29181bca26c221ca0a3364f71f79d3d3a4db4.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Prepare release
Fix zlib merge snafu
ssh: fix broken printouts
ssh: exclude aes_gcm if peer is OpenSSH 6.2 (known bug)
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/doc/src/notes.xml | 24 | ||||
| -rw-r--r-- | erts/preloaded/src/zlib.erl | 2 | ||||
| -rw-r--r-- | erts/vsn.mk | 2 |
3 files changed, 26 insertions, 2 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index 1a5bea8820..fa200176e4 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -31,6 +31,30 @@ </header> <p>This document describes the changes made to the ERTS application.</p> +<section><title>Erts 9.1.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p>The new zlib module returned a data_error when + inflating concatenated streams, which was incompatible + with the old module's behavior of returning the + uncompressed data up to the end of the first stream.</p> + <p> + Own Id: OTP-14648</p> + </item> + <item> + <p>zlib:gunzip/1 will no longer stop at the end of the + first stream when decompressing concatenated gzip + files.</p> + <p> + Own Id: OTP-14649</p> + </item> + </list> + </section> + +</section> + <section><title>Erts 9.1</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/erts/preloaded/src/zlib.erl b/erts/preloaded/src/zlib.erl index 611010550f..3170ab6351 100644 --- a/erts/preloaded/src/zlib.erl +++ b/erts/preloaded/src/zlib.erl @@ -692,4 +692,4 @@ enqueue_input_1(Z, IOVec) -> end. enqueue_nif(_Z, _IOVec) -> - erlang:nif_error(undef).
\ No newline at end of file + erlang:nif_error(undef). diff --git a/erts/vsn.mk b/erts/vsn.mk index 380be1b534..1c6472a0ab 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 9.1 +VSN = 9.1.1 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |