diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-05-20 14:38:05 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-05-20 14:38:05 +0200 |
| commit | e6663423e55bbb87aeaf99890081a27f19611c7a (patch) | |
| tree | 691013cc05377921dc559474fd8ef0ab33376741 /lib | |
| parent | 1972777d766803315ac1b16dcf533a2bb822f33c (diff) | |
| parent | b928e601fcff6df38d7c914050f21db3f85f2d83 (diff) | |
| download | otp-e6663423e55bbb87aeaf99890081a27f19611c7a.tar.gz otp-e6663423e55bbb87aeaf99890081a27f19611c7a.tar.bz2 otp-e6663423e55bbb87aeaf99890081a27f19611c7a.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/doc/src/notes.xml | 17 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml index a27498b5e2..01cd630668 100644 --- a/lib/ssl/doc/src/notes.xml +++ b/lib/ssl/doc/src/notes.xml @@ -27,6 +27,23 @@ </header> <p>This document describes the changes made to the SSL application.</p> +<section><title>SSL 9.3.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Missing check of size of user_data_buffer made internal + socket behave as an active socket instead of active N. + This could cause memory problems.</p> + <p> + Own Id: OTP-15825 Aux Id: ERL-934, OTP-15823 </p> + </item> + </list> + </section> + +</section> + <section><title>SSL 9.3</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 3c66ffd852..cbc32cd5a8 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 9.3 +SSL_VSN = 9.3.1 |