diff options
| -rw-r--r-- | lib/ssl/doc/src/notes.xml | 20 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 | ||||
| -rw-r--r-- | make/otp_version_tickets | 5 |
3 files changed, 22 insertions, 5 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml index 368f215f16..e647bd1d94 100644 --- a/lib/ssl/doc/src/notes.xml +++ b/lib/ssl/doc/src/notes.xml @@ -27,6 +27,26 @@ </header> <p>This document describes the changes made to the SSL application.</p> +<section><title>SSL 10.2.4.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Backport of OTP-17282</p> + <p> + Correct handling of default values for emulated socket + options and retain the order of the ssl options list to + ensure backwards compatible behavior if options should be + set more than once.</p> + <p> + Own Id: OTP-17289 Aux Id: GH-4585 </p> + </item> + </list> + </section> + +</section> + <section><title>SSL 10.2.4</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 451777e4b7..8784c37881 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 10.2.4 +SSL_VSN = 10.2.4.1 diff --git a/make/otp_version_tickets b/make/otp_version_tickets index f66f16de77..9dc3c0a550 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1,4 +1 @@ -OTP-12960 -OTP-16607 -OTP-17227 -OTP-17228 +OTP-17289 |