From a1dda336e24cb1783165481d31cd8df24ac432c7 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Fri, 11 Oct 2024 11:08:15 +0200 Subject: [PATCH 1/3] Update copyright year --- erts/emulator/beam/beam_bp.h | 2 +- erts/emulator/test/trace_call_time_SUITE.erl | 2 +- .../test/parallel_messages_SUITE_data/visualize_throughput.html | 2 +- lib/common_test/src/test_server.erl | 2 +- lib/inets/src/http_client/httpc.erl | 2 +- lib/inets/src/http_client/httpc_handler.erl | 2 +- lib/inets/src/http_client/httpc_internal.hrl | 2 +- lib/inets/src/http_client/httpc_request.erl | 2 +- lib/inets/src/http_client/httpc_response.erl | 2 +- lib/inets/test/httpc_SUITE.erl | 2 +- lib/ssh/src/Makefile | 2 +- lib/ssh/src/ssh.erl | 2 +- lib/ssh/src/ssh_app.erl | 2 +- lib/ssh/src/ssh_connect.hrl | 2 +- lib/ssh/src/ssh_connection_sup.erl | 2 +- lib/ssh/src/ssh_info.erl | 2 +- lib/ssh/src/ssh_system_sup.erl | 2 +- lib/ssh/src/ssh_tcpip_forward_acceptor.erl | 2 +- lib/ssh/test/ssh_sup_SUITE.erl | 2 +- lib/ssl/src/ssl_connection.hrl | 2 +- lib/ssl/src/ssl_gen_statem.erl | 2 +- lib/ssl/src/tls_gen_connection.erl | 2 +- lib/ssl/src/tls_handshake.erl | 2 +- lib/ssl/test/tls_1_3_version_SUITE.erl | 2 +- lib/stdlib/src/supervisor.erl | 2 +- lib/stdlib/src/uri_string.erl | 2 +- lib/stdlib/test/ets_SUITE_data/visualize_throughput.html | 2 +- lib/stdlib/test/uri_string_SUITE.erl | 2 +- system/COPYRIGHT | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/erts/emulator/beam/beam_bp.h b/erts/emulator/beam/beam_bp.h index d9b786dd1fc0..eeb6d1797f89 100644 --- a/erts/emulator/beam/beam_bp.h +++ b/erts/emulator/beam/beam_bp.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2000-2021. All Rights Reserved. + * Copyright Ericsson AB 2000-2024. 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/erts/emulator/test/trace_call_time_SUITE.erl b/erts/emulator/test/trace_call_time_SUITE.erl index df22e3d0f1b4..aa572bb511e8 100644 --- a/erts/emulator/test/trace_call_time_SUITE.erl +++ b/erts/emulator/test/trace_call_time_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2011-2021. All Rights Reserved. +%% Copyright Ericsson AB 2011-2024. 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/erts/test/parallel_messages_SUITE_data/visualize_throughput.html b/erts/test/parallel_messages_SUITE_data/visualize_throughput.html index 98ad07f81daa..ad5977771e70 100644 --- a/erts/test/parallel_messages_SUITE_data/visualize_throughput.html +++ b/erts/test/parallel_messages_SUITE_data/visualize_throughput.html @@ -4,7 +4,7 @@ - + diff --git a/lib/common_test/src/test_server.erl b/lib/common_test/src/test_server.erl index 404ccaf1128b..18b0d5654acf 100644 --- a/lib/common_test/src/test_server.erl +++ b/lib/common_test/src/test_server.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2022. All Rights Reserved. +%% Copyright Ericsson AB 1996-2024. 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/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl index dd10481fab1c..a33ed6513827 100644 --- a/lib/inets/src/http_client/httpc.erl +++ b/lib/inets/src/http_client/httpc.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2009-2023. All Rights Reserved. +%% Copyright Ericsson AB 2009-2024. 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/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl index be32ebfbad30..3a6a2c8ca68e 100644 --- a/lib/inets/src/http_client/httpc_handler.erl +++ b/lib/inets/src/http_client/httpc_handler.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2002-2023. All Rights Reserved. +%% Copyright Ericsson AB 2002-2024. 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/inets/src/http_client/httpc_internal.hrl b/lib/inets/src/http_client/httpc_internal.hrl index 9114fda3352b..d69183ae42d8 100644 --- a/lib/inets/src/http_client/httpc_internal.hrl +++ b/lib/inets/src/http_client/httpc_internal.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2023. All Rights Reserved. +%% Copyright Ericsson AB 2005-2024. 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/inets/src/http_client/httpc_request.erl b/lib/inets/src/http_client/httpc_request.erl index a9fcdc944959..146755624877 100644 --- a/lib/inets/src/http_client/httpc_request.erl +++ b/lib/inets/src/http_client/httpc_request.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2023. All Rights Reserved. +%% Copyright Ericsson AB 2004-2024. 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/inets/src/http_client/httpc_response.erl b/lib/inets/src/http_client/httpc_response.erl index a3b81a6f7c2e..603cd64ea8ae 100644 --- a/lib/inets/src/http_client/httpc_response.erl +++ b/lib/inets/src/http_client/httpc_response.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2023. All Rights Reserved. +%% Copyright Ericsson AB 2004-2024. 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/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl index f78d8a60ab31..a5e39e334a2e 100644 --- a/lib/inets/test/httpc_SUITE.erl +++ b/lib/inets/test/httpc_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2023. All Rights Reserved. +%% Copyright Ericsson AB 2004-2024. 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/ssh/src/Makefile b/lib/ssh/src/Makefile index ee25174ed858..fa32b802ed1e 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2004-2022. All Rights Reserved. +# Copyright Ericsson AB 2004-2024. 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/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index ad8ca9814a56..ecdb354492c2 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -1,7 +1,7 @@ % %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2023. All Rights Reserved. +%% Copyright Ericsson AB 2004-2024. 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/ssh/src/ssh_app.erl b/lib/ssh/src/ssh_app.erl index 0303b9d23200..6fcb8471f5d4 100644 --- a/lib/ssh/src/ssh_app.erl +++ b/lib/ssh/src/ssh_app.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2021. All Rights Reserved. +%% Copyright Ericsson AB 2004-2024. 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/ssh/src/ssh_connect.hrl b/lib/ssh/src/ssh_connect.hrl index 4c6fdaefd4c3..07bbf6005f68 100644 --- a/lib/ssh/src/ssh_connect.hrl +++ b/lib/ssh/src/ssh_connect.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2021. All Rights Reserved. +%% Copyright Ericsson AB 2005-2024. 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/ssh/src/ssh_connection_sup.erl b/lib/ssh/src/ssh_connection_sup.erl index 2774e4a7a44e..3d8ac4171e0a 100644 --- a/lib/ssh/src/ssh_connection_sup.erl +++ b/lib/ssh/src/ssh_connection_sup.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2021. All Rights Reserved. +%% Copyright Ericsson AB 2008-2024. 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/ssh/src/ssh_info.erl b/lib/ssh/src/ssh_info.erl index 82a936b5f696..8a0a345be722 100644 --- a/lib/ssh/src/ssh_info.erl +++ b/lib/ssh/src/ssh_info.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2021. All Rights Reserved. +%% Copyright Ericsson AB 2008-2024. 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/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl index 8e0bc75df7ca..5eb9c9b02b1c 100644 --- a/lib/ssh/src/ssh_system_sup.erl +++ b/lib/ssh/src/ssh_system_sup.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2022. All Rights Reserved. +%% Copyright Ericsson AB 2008-2024. 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/ssh/src/ssh_tcpip_forward_acceptor.erl b/lib/ssh/src/ssh_tcpip_forward_acceptor.erl index bf6ee5540d87..c3ebb902e3fb 100644 --- a/lib/ssh/src/ssh_tcpip_forward_acceptor.erl +++ b/lib/ssh/src/ssh_tcpip_forward_acceptor.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2021. All Rights Reserved. +%% Copyright Ericsson AB 2008-2024. 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/ssh/test/ssh_sup_SUITE.erl b/lib/ssh/test/ssh_sup_SUITE.erl index d76ce9edf6d5..44f4c0010a61 100644 --- a/lib/ssh/test/ssh_sup_SUITE.erl +++ b/lib/ssh/test/ssh_sup_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2015-2021. All Rights Reserved. +%% Copyright Ericsson AB 2015-2024. 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/src/ssl_connection.hrl b/lib/ssl/src/ssl_connection.hrl index 5efdccfdfd77..97d97d86722e 100644 --- a/lib/ssl/src/ssl_connection.hrl +++ b/lib/ssl/src/ssl_connection.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2013-2022. All Rights Reserved. +%% Copyright Ericsson AB 2013-2024. 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/src/ssl_gen_statem.erl b/lib/ssl/src/ssl_gen_statem.erl index 3f487bd1684e..d61885f5e23e 100644 --- a/lib/ssl/src/ssl_gen_statem.erl +++ b/lib/ssl/src/ssl_gen_statem.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2023. All Rights Reserved. +%% Copyright Ericsson AB 2007-2024. 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/src/tls_gen_connection.erl b/lib/ssl/src/tls_gen_connection.erl index 882a7a688166..db74d746693b 100644 --- a/lib/ssl/src/tls_gen_connection.erl +++ b/lib/ssl/src/tls_gen_connection.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2020-2022. All Rights Reserved. +%% Copyright Ericsson AB 2020-2024. 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/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl index fec606e5642f..e01be5a41ebf 100644 --- a/lib/ssl/src/tls_handshake.erl +++ b/lib/ssl/src/tls_handshake.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2022. All Rights Reserved. +%% Copyright Ericsson AB 2007-2024. 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/tls_1_3_version_SUITE.erl b/lib/ssl/test/tls_1_3_version_SUITE.erl index 54220609cc77..f97886e7f9b7 100644 --- a/lib/ssl/test/tls_1_3_version_SUITE.erl +++ b/lib/ssl/test/tls_1_3_version_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2019-2022. All Rights Reserved. +%% Copyright Ericsson AB 2019-2024. 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/stdlib/src/supervisor.erl b/lib/stdlib/src/supervisor.erl index 5b405006dd9f..9299dc6f252f 100644 --- a/lib/stdlib/src/supervisor.erl +++ b/lib/stdlib/src/supervisor.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2023. All Rights Reserved. +%% Copyright Ericsson AB 1996-2024. 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/stdlib/src/uri_string.erl b/lib/stdlib/src/uri_string.erl index 6ab5c58cffee..bb3b9e77638b 100644 --- a/lib/stdlib/src/uri_string.erl +++ b/lib/stdlib/src/uri_string.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2017-2022. All Rights Reserved. +%% Copyright Ericsson AB 2017-2024. 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/stdlib/test/ets_SUITE_data/visualize_throughput.html b/lib/stdlib/test/ets_SUITE_data/visualize_throughput.html index 140568bf690c..c8fb4dc0c14e 100644 --- a/lib/stdlib/test/ets_SUITE_data/visualize_throughput.html +++ b/lib/stdlib/test/ets_SUITE_data/visualize_throughput.html @@ -4,7 +4,7 @@ - + diff --git a/lib/stdlib/test/uri_string_SUITE.erl b/lib/stdlib/test/uri_string_SUITE.erl index b1fbb48e573f..2fac4efee7f7 100644 --- a/lib/stdlib/test/uri_string_SUITE.erl +++ b/lib/stdlib/test/uri_string_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2022. All Rights Reserved. +%% Copyright Ericsson AB 2008-2024. 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/system/COPYRIGHT b/system/COPYRIGHT index 1761dfb1f39b..a64ad46ca5f1 100644 --- a/system/COPYRIGHT +++ b/system/COPYRIGHT @@ -8,7 +8,7 @@ This software is subject to the following Copyrights and Licenses: %CopyrightBegin% -Copyright Ericsson AB 1997-2023. All Rights Reserved. +Copyright Ericsson AB 1997-2024. 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. From 92800914ba5366482c0d353475dad69696f8bbda Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Fri, 11 Oct 2024 11:08:17 +0200 Subject: [PATCH 2/3] Prepare release --- erts/doc/src/notes.xml | 17 ++++++++++++ erts/vsn.mk | 2 +- lib/common_test/doc/src/notes.xml | 32 +++++++++++++++++++++++ lib/common_test/vsn.mk | 2 +- lib/inets/doc/src/notes.xml | 29 ++++++++++++++++++++- lib/inets/vsn.mk | 2 +- lib/public_key/doc/src/notes.xml | 19 ++++++++++++++ lib/public_key/vsn.mk | 2 +- lib/ssh/doc/src/notes.xml | 31 ++++++++++++++++++++++ lib/ssh/vsn.mk | 2 +- lib/ssl/doc/src/notes.xml | 43 +++++++++++++++++++++++++++++++ lib/ssl/vsn.mk | 2 +- lib/stdlib/doc/src/notes.xml | 24 +++++++++++++++++ lib/stdlib/vsn.mk | 2 +- make/otp_version_tickets | 20 ++++++++++---- 15 files changed, 216 insertions(+), 13 deletions(-) diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index 75967d69c776..3d2dc1573903 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -31,6 +31,23 @@

This document describes the changes made to the ERTS application.

+
Erts 13.2.2.11 + +
Fixed Bugs and Malfunctions + + +

Fixed beam crash that could happen if resetting + call_time or call_memory trace counters of + a function while it is called. Bug exists since OTP + R16.

+

+ Own Id: OTP-19269 Aux Id: GH-8835, PR-8897

+ + +
+ +
+
Erts 13.2.2.10
Fixed Bugs and Malfunctions diff --git a/erts/vsn.mk b/erts/vsn.mk index 2684a2de6f3f..a470420236ea 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 13.2.2.10 +VSN = 13.2.2.11 # Port number 4365 in 4.2 # Port number 4366 in 4.3 diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml index ae620de04162..8fb49e12f61c 100644 --- a/lib/common_test/doc/src/notes.xml +++ b/lib/common_test/doc/src/notes.xml @@ -33,6 +33,38 @@ notes.xml +
Common_Test 1.24.0.4 + +
Fixed Bugs and Malfunctions + + +

+ With this change, HTML reports include jQuery version + 3.7.1.

+

+ Own Id: OTP-19252 Aux Id: PR-8858

+ + +

+ With this change, jquery and tablesorter licenses are + added to COPYRIGHT file. Also tablesorter is updated to + version 2.32.

+

+ Own Id: OTP-19265 Aux Id: PR-8876

+ + +

+ Fixed a bug where the sum of testcases' execution time in + HTML logs was sometimes miscalculated, and the table was + not fully printed.

+

+ Own Id: OTP-19284 Aux Id: ERIERL-1093, PR-8909

+ + +
+ +
+
Common_Test 1.24.0.3
Fixed Bugs and Malfunctions diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk index 27153e8d13f8..7852128c1b02 100644 --- a/lib/common_test/vsn.mk +++ b/lib/common_test/vsn.mk @@ -1 +1 @@ -COMMON_TEST_VSN = 1.24.0.3 +COMMON_TEST_VSN = 1.24.0.4 diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index b68f9a8b3808..e1ca4f16b656 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -33,7 +33,34 @@ notes.xml -
Inets 8.3.1.3 +
Inets 8.3.1.4 + +
Fixed Bugs and Malfunctions + + +

+ With this change, HTTP client, when returning an + asynchronous request, now correctly takes into account + `OptionRequest - full_result`

+

+ *** POTENTIAL INCOMPATIBILITY ***

+

+ Own Id: OTP-19158

+ + +

+ With this change, synchronous httpc:request now timeouts + after `Timeout` specified in `HttpOption {timeout, + Timeout}`

+

+ Own Id: OTP-19221 Aux Id: ERIERL-1091, PR-8788, PR-8801

+ + +
+ +
+ +
Inets 8.3.1.3
Fixed Bugs and Malfunctions diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk index 8fdcc536e6d7..e78180b21a88 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -19,6 +19,6 @@ # %CopyrightEnd% APPLICATION = inets -INETS_VSN = 8.3.1.3 +INETS_VSN = 8.3.1.4 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml index a70d94171751..5fa7c2a498c9 100644 --- a/lib/public_key/doc/src/notes.xml +++ b/lib/public_key/doc/src/notes.xml @@ -35,6 +35,25 @@ notes.xml +
Public_Key 1.13.3.4 + +
Improvements and New Features + + +

+ Do not hide crypto badarg reason, this error handling + enhancement facilitates debugging. These kind of runtime + errors are not documented and should never be relied on + for matching, they are intended for catching input errors + early.

+

+ Own Id: OTP-19238 Aux Id: PR-8831

+ + +
+ +
+
Public_Key 1.13.3.3
Fixed Bugs and Malfunctions diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk index 93c72b544a73..65a8281a7588 100644 --- a/lib/public_key/vsn.mk +++ b/lib/public_key/vsn.mk @@ -1 +1 @@ -PUBLIC_KEY_VSN = 1.13.3.3 +PUBLIC_KEY_VSN = 1.13.3.4 diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index 8029f947abf8..712c8d4fe8e8 100644 --- a/lib/ssh/doc/src/notes.xml +++ b/lib/ssh/doc/src/notes.xml @@ -30,6 +30,37 @@ notes.xml +
Ssh 4.15.3.7 + +
Fixed Bugs and Malfunctions + + +

+ With this change, a race condition is removed from ssh + client connection setup procedure.

+

+ Own Id: OTP-19124 Aux Id: GH-7550, PR-8766

+ + +

+ With this change, ssh:connect is not affected by presence + of EXIT message in queue.

+

+ Own Id: OTP-19246 Aux Id: GH-8223, PR-8854

+ + +

+ With this change, ssh appends {active, false} option + after socket options received from user - so that false + value is always used.

+

+ Own Id: OTP-19247 Aux Id: PR-8226

+ + +
+ +
+
Ssh 4.15.3.6
Fixed Bugs and Malfunctions diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index d53ea8f85494..28ec35dde94e 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,4 +1,4 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 4.15.3.6 +SSH_VSN = 4.15.3.7 APP_VSN = "ssh-$(SSH_VSN)" diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml index 2f28ff93c07c..b0ae1f88cb6f 100644 --- a/lib/ssl/doc/src/notes.xml +++ b/lib/ssl/doc/src/notes.xml @@ -27,6 +27,49 @@

This document describes the changes made to the SSL application.

+
SSL 10.9.1.6 + +
Fixed Bugs and Malfunctions + + +

+ Starting from TLS-1.3 some server handshake alerts might + arrive after ssl:connection/2,3,4 has returned. If the + socket is in active mode the controlling process will get + the alert message, but passive sockets would only get + {error, closed} on next call to ssl:recv/2,3 or + ssl/setopts/2. Passive sockets calls will now return + {error, error_alert()} instead.

+

+ Own Id: OTP-19236 Aux Id: PR-8261

+ + +

+ Servers configured to support only version (pre TLS-1.2) + should ignore hello version extension, as it is an + unknown extension to them, this will result in that new + clients that do not support the old server version will + get an insufficient security alert from the server and + not a protocol version alert, this is consistent with how + old servers not able to support higher protocol versions + work.

+

+ Own Id: OTP-19257 Aux Id: ERIERL-1131

+ + +

+ Correct timeout handling for termination code run for own + alerts, so that intended timeout is used instead of + falling back to OS TCP-stack timeout that is unreasonably + long on some platforms.

+

+ Own Id: OTP-19274 Aux Id: PR-8901

+ + +
+ +
+
SSL 10.9.1.5
Fixed Bugs and Malfunctions diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 5436fbd19fe9..99da0af925f0 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 10.9.1.5 +SSL_VSN = 10.9.1.6 diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index 98a6d463f60d..f6ac5414f4cf 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -31,6 +31,30 @@

This document describes the changes made to the STDLIB application.

+
STDLIB 4.3.1.5 + +
Fixed Bugs and Malfunctions + + +

+ With this change, shutdown procedure handles a race + condition between supervisor executing a shutdown and + child process termination from other reason.

+

+ Own Id: OTP-19256 Aux Id: PR-8780

+ + +

+ With this change, uri_string:normalize assumes empty path + (do not crash) when no path is provided in the URI map.

+

+ Own Id: OTP-19266 Aux Id: ERIERL-1127, PR-8890

+ + +
+ +
+
STDLIB 4.3.1.4
Fixed Bugs and Malfunctions diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk index 2bb84355e8d0..729b1b362e86 100644 --- a/lib/stdlib/vsn.mk +++ b/lib/stdlib/vsn.mk @@ -1 +1 @@ -STDLIB_VSN = 4.3.1.4 +STDLIB_VSN = 4.3.1.5 diff --git a/make/otp_version_tickets b/make/otp_version_tickets index f63e92bed561..170170725faa 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1,5 +1,15 @@ -OTP-19170 -OTP-19173 -OTP-19179 -OTP-19206 -OTP-19217 +OTP-19124 +OTP-19158 +OTP-19221 +OTP-19236 +OTP-19238 +OTP-19246 +OTP-19247 +OTP-19252 +OTP-19256 +OTP-19257 +OTP-19265 +OTP-19266 +OTP-19269 +OTP-19274 +OTP-19284 From cd91473539f38e88d10cf9efce3551afa1dbdb45 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Fri, 11 Oct 2024 11:08:19 +0200 Subject: [PATCH 3/3] Updated OTP version --- OTP_VERSION | 2 +- otp_versions.table | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OTP_VERSION b/OTP_VERSION index 3f029b83e239..f58b092e58e7 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -25.3.2.14 +25.3.2.15 diff --git a/otp_versions.table b/otp_versions.table index c5cb810b194b..ceeb9fa27602 100644 --- a/otp_versions.table +++ b/otp_versions.table @@ -1,3 +1,4 @@ +OTP-25.3.2.15 : common_test-1.24.0.4 erts-13.2.2.11 inets-8.3.1.4 public_key-1.13.3.4 ssh-4.15.3.7 ssl-10.9.1.6 stdlib-4.3.1.5 # asn1-5.0.21.1 compiler-8.2.6.4 crypto-5.1.4.3 debugger-5.3.1.3 dialyzer-5.0.5 diameter-2.2.7.2 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 et-1.6.5 eunit-2.8.2 ftp-1.1.4 jinterface-1.13.2 kernel-8.5.4.3 megaco-4.4.3 mnesia-4.21.4.3 observer-2.14.0.1 odbc-2.14 os_mon-2.8.2.1 parsetools-2.4.1 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.2 : OTP-25.3.2.14 : diameter-2.2.7.2 public_key-1.13.3.3 ssh-4.15.3.6 xmerl-1.3.31.2 # asn1-5.0.21.1 common_test-1.24.0.3 compiler-8.2.6.4 crypto-5.1.4.3 debugger-5.3.1.3 dialyzer-5.0.5 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 erts-13.2.2.10 et-1.6.5 eunit-2.8.2 ftp-1.1.4 inets-8.3.1.3 jinterface-1.13.2 kernel-8.5.4.3 megaco-4.4.3 mnesia-4.21.4.3 observer-2.14.0.1 odbc-2.14 os_mon-2.8.2.1 parsetools-2.4.1 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 ssl-10.9.1.5 stdlib-4.3.1.4 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 : OTP-25.3.2.13 : erts-13.2.2.10 ssh-4.15.3.5 ssl-10.9.1.5 # asn1-5.0.21.1 common_test-1.24.0.3 compiler-8.2.6.4 crypto-5.1.4.3 debugger-5.3.1.3 dialyzer-5.0.5 diameter-2.2.7.1 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 et-1.6.5 eunit-2.8.2 ftp-1.1.4 inets-8.3.1.3 jinterface-1.13.2 kernel-8.5.4.3 megaco-4.4.3 mnesia-4.21.4.3 observer-2.14.0.1 odbc-2.14 os_mon-2.8.2.1 parsetools-2.4.1 public_key-1.13.3.2 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 stdlib-4.3.1.4 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.1 : OTP-25.3.2.12 : erts-13.2.2.9 mnesia-4.21.4.3 ssl-10.9.1.4 # asn1-5.0.21.1 common_test-1.24.0.3 compiler-8.2.6.4 crypto-5.1.4.3 debugger-5.3.1.3 dialyzer-5.0.5 diameter-2.2.7.1 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 et-1.6.5 eunit-2.8.2 ftp-1.1.4 inets-8.3.1.3 jinterface-1.13.2 kernel-8.5.4.3 megaco-4.4.3 observer-2.14.0.1 odbc-2.14 os_mon-2.8.2.1 parsetools-2.4.1 public_key-1.13.3.2 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 ssh-4.15.3.4 stdlib-4.3.1.4 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.1 :