aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2019-05-15 15:16:32 +0200
committerErlang/OTP <[email protected]>2019-05-15 15:16:32 +0200
commit7ff87210ac697c1276fbf81706705b7a9dc5c884 (patch)
tree8b0184c90d2ef6208fb8771539e66782e3934368
parent70dea49bf0fc7ac7cc99e81ec15857b05e3ed98f (diff)
downloadotp-7ff87210ac697c1276fbf81706705b7a9dc5c884.tar.gz
otp-7ff87210ac697c1276fbf81706705b7a9dc5c884.tar.bz2
otp-7ff87210ac697c1276fbf81706705b7a9dc5c884.zip
Prepare release
-rw-r--r--lib/xmerl/doc/src/notes.xml17
-rw-r--r--lib/xmerl/vsn.mk2
-rw-r--r--make/otp_version_tickets4
3 files changed, 19 insertions, 4 deletions
diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index d6b6dfdfb5..63070ea316 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,23 @@
<p>This document describes the changes made to the Xmerl application.</p>
+<section><title>Xmerl 1.3.20.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ <c>xmerl_sax_parser</c> crashed during charset detection
+ when the xml declarations attribute values was missing
+ the closing quotation (&apos; or &quot;).</p>
+ <p>
+ Own Id: OTP-15826</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Xmerl 1.3.20</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index 31ffa6e749..3c97615e1e 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1 +1 @@
-XMERL_VSN = 1.3.20
+XMERL_VSN = 1.3.20.1
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index 8fa2b7da18..221604b5e4 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1,3 +1 @@
-OTP-15813
-OTP-15819
-OTP-15823
+OTP-15826