diff options
author | Bruce Yinhe <[email protected]> | 2014-10-15 10:13:27 +0200 |
---|---|---|
committer | Bruce Yinhe <[email protected]> | 2014-10-15 10:13:27 +0200 |
commit | f5b344378128831127026b3e18154fdf23d4713c (patch) | |
tree | 0efdb3e0b76d47fceffa39c9e632e02ef2818257 /lib/ssl/doc | |
parent | 56daa687a24a26ab08434c68ca172d5bd31cfdf7 (diff) | |
parent | 5d49d05c3604f764736b10cfb287818d4b41efda (diff) | |
download | otp-f5b344378128831127026b3e18154fdf23d4713c.tar.gz otp-f5b344378128831127026b3e18154fdf23d4713c.tar.bz2 otp-f5b344378128831127026b3e18154fdf23d4713c.zip |
Merge branch 'maint-17' into maint
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/ssl/doc')
-rw-r--r-- | lib/ssl/doc/src/notes.xml | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml index 8643cd3745..62e9bd0165 100644 --- a/lib/ssl/doc/src/notes.xml +++ b/lib/ssl/doc/src/notes.xml @@ -25,7 +25,23 @@ <file>notes.xml</file> </header> <p>This document describes the changes made to the SSL application.</p> - <section><title>SSL 5.3.6</title> + <section><title>SSL 5.3.7</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Handle the fact that servers may send an empty SNI + extension to the client.</p> + <p> + Own Id: OTP-12198</p> + </item> + </list> + </section> + +</section> + +<section><title>SSL 5.3.6</title> <section><title>Fixed Bugs and Malfunctions</title> <list> |