diff options
| author | Jakub Witczak <kuba@erix.ericsson.se> | 2023-04-21 11:02:37 +0200 |
|---|---|---|
| committer | Jakub Witczak <kuba@erix.ericsson.se> | 2023-04-21 11:02:37 +0200 |
| commit | 25a97a1e306fd10f01849758c7c3ef8097c2e670 (patch) | |
| tree | bdf3bf4e75c9ff1ed25e75e4aadfbd0fa6d33cd4 /lib | |
| parent | ce43b033325e988a6c7e29b03033b2765ae6e7d4 (diff) | |
| parent | a23ba70ef91a76470fcf3d1c60d3e9f641f05844 (diff) | |
| download | erlang-25a97a1e306fd10f01849758c7c3ef8097c2e670.tar.gz | |
Merge branch 'maint-24' into maint
* maint-24:
Updated OTP version
Prepare release
Update copyright year
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/inets/doc/src/notes.xml | 18 | ||||
| -rw-r--r-- | lib/ssl/doc/src/notes.xml | 17 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_cipher_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_session_SUITE.erl | 2 |
4 files changed, 37 insertions, 2 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index a6d3e10620..9b234c37f1 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -276,6 +276,24 @@ </section> + <section><title>Inets 7.5.3.4</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + With this change, upon remote socket closure current + request is added to a retried queue (either pipeline or + keep_alive, but not both).</p> + <p> + Own Id: OTP-18545 Aux Id: OTP-18509, ERIERL-937, + ERIERL-928 </p> + </item> + </list> + </section> + +</section> + <section><title>Inets 7.5.3.3</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml index a36ac8d78d..6ff15d429a 100644 --- a/lib/ssl/doc/src/notes.xml +++ b/lib/ssl/doc/src/notes.xml @@ -444,6 +444,23 @@ </section> +<section><title>SSL 10.7.3.7</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Client signature algorithm list input order is now + honored again , it was accidently reversed by a previous + fix.</p> + <p> + Own Id: OTP-18550</p> + </item> + </list> + </section> + +</section> + <section><title>SSL 10.7.3.6</title> <section><title>Improvements and New Features</title> diff --git a/lib/ssl/test/ssl_cipher_SUITE.erl b/lib/ssl/test/ssl_cipher_SUITE.erl index 70c0b50d4a..442cc5f790 100644 --- a/lib/ssl/test/ssl_cipher_SUITE.erl +++ b/lib/ssl/test/ssl_cipher_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2022. All Rights Reserved. +%% Copyright Ericsson AB 2008-2023. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/lib/ssl/test/ssl_session_SUITE.erl b/lib/ssl/test/ssl_session_SUITE.erl index f597c78bb5..b1f093351e 100644 --- a/lib/ssl/test/ssl_session_SUITE.erl +++ b/lib/ssl/test/ssl_session_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2022. All Rights Reserved. +%% Copyright Ericsson AB 2007-2023. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. |