aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/doc/src/notes.xml
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-02-03 12:55:45 +0100
committerZandra Hird <[email protected]>2015-02-03 12:55:45 +0100
commit9a393fb5237b637cc4cfdb79443a1517743eadd8 (patch)
tree55137e2b85afd9bffdf9355673479878ed6f9d08 /lib/inets/doc/src/notes.xml
parentc8bbf52191e3c87eedde061051eebcd02dbb7fd5 (diff)
parent42d6afe554e11813385dbf175fce58f995c2f9e5 (diff)
downloadotp-9a393fb5237b637cc4cfdb79443a1517743eadd8.tar.gz
otp-9a393fb5237b637cc4cfdb79443a1517743eadd8.tar.bz2
otp-9a393fb5237b637cc4cfdb79443a1517743eadd8.zip
Merge branch 'maint'
Conflicts: OTP_VERSION erts/emulator/sys/unix/sys.c erts/vsn.mk
Diffstat (limited to 'lib/inets/doc/src/notes.xml')
-rw-r--r--lib/inets/doc/src/notes.xml35
1 files changed, 34 insertions, 1 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index fb7034498c..7f73aa5e7b 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -32,7 +32,40 @@
<file>notes.xml</file>
</header>
- <section><title>Inets 5.10.4</title>
+ <section><title>Inets 5.10.5</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ mod_alias now handles https-URIs properly</p>
+ <p>
+ Consistent view of configuration parameter
+ keep_alive_timeout, should be presented in the
+ httpd:info/[1,2] function in the same unit as it is
+ inputted.</p>
+ <p>
+ Own Id: OTP-12436 Aux Id: seq12786 </p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Gracefully handle invalid content-lenght headers instead
+ of crashing in list_to_integer.</p>
+ <p>
+ Own Id: OTP-12429</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Inets 5.10.4</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>