aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorPéter Dimitrov <[email protected]>2017-09-14 17:38:40 +0200
committerPéter Dimitrov <[email protected]>2017-09-14 17:38:40 +0200
commit29c8936ac73bfff98dddcfcc3b48e169f28c06d6 (patch)
tree3afc43f525b0258553d9f1c717df1bbb640f2464 /erts
parent722293a988485cce7cbc975bd5ac9096d2a91b9b (diff)
parent94333e038485030f385012c99c0e7995ae03f499 (diff)
downloadotp-29c8936ac73bfff98dddcfcc3b48e169f28c06d6.tar.gz
otp-29c8936ac73bfff98dddcfcc3b48e169f28c06d6.tar.bz2
otp-29c8936ac73bfff98dddcfcc3b48e169f28c06d6.zip
Merge branch 'maint'
* maint: Updated OTP version Update release notes Update version numbers inets: httpd correct server_name environment value inets: httpd - Add chunk handling of client data inets: Restore old behavior when parsing "+" inets: prepare for release
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/notes.xml21
-rw-r--r--erts/vsn.mk2
2 files changed, 22 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 050e84f0c1..10b963a4e8 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,27 @@
</header>
<p>This document describes the changes made to the ERTS application.</p>
+<section><title>Erts 9.0.5</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed bug in <c>binary_to_term</c> and
+ <c>binary_to_atom</c> that could cause VM crash.
+ Typically happens when the last character of an UTF8
+ string is in the range 128 to 255, but truncated to only
+ one byte. Bug exists in <c>binary_to_term</c> since ERTS
+ version 5.10.2 (OTP_R16B01) and <c>binary_to_atom</c>
+ since ERTS version 9.0 (OTP-20.0).</p>
+ <p>
+ Own Id: OTP-14590 Aux Id: ERL-474 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 9.0.4</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 8ed3993177..c231c9c27d 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
#
-VSN = 9.0.4
+VSN = 9.0.5
# Port number 4365 in 4.2
# Port number 4366 in 4.3