Merge branch 'maint-26' into maint

* maint-26: Updated OTP version Prepare release Update copyright year
erlang · Jun 25, 2024 · c0c2750 · c0c2750
2 parents f9cae68 + 858efd5
commit c0c2750
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 2 deletions.
diff --git a/erts/doc/notes.md b/erts/doc/notes.md
@@ -249,6 +249,20 @@ This document describes the changes made to the ERTS application.
 [PR-7809]: https://github.com/erlang/otp/pull/7809
 [PR-7977]: https://github.com/erlang/otp/pull/7977
 
+## Erts 14.2.5.1
+
+### Fixed Bugs and Malfunctions
+
+* A call to socket:\[recv|recvfrom|recvmsg]/* with Timeout = 0 on Windows could cause a (case clause) crash if data is immediately available.
+
+  Own Id: OTP-19063 Aux Id: OTP-18835
+* When a port command crashed in the inet driver during `gen_tcp:send/2`, a monitor `'DOWN'` message could be left lingering in the caller's mailbox. This has now been fixed.
+
+  Own Id: OTP-19121 Aux Id: GH-8484
+* `'DOWN'` messages originating from a monitored port, contained the atom `process` instead of the atom `port` as the third element when the exit reason was not an immediate term.
+
+  Own Id: OTP-19123 Aux Id: GH-8484, PR-8546
+
 ## Erts 14.2.5
 
 ### Fixed Bugs and Malfunctions

diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %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.

diff --git a/lib/diameter/doc/notes.md b/lib/diameter/doc/notes.md
@@ -41,6 +41,14 @@ Releases are listed in reverse chronological order, most recent first.
 [PR-8026]: https://github.com/erlang/otp/pull/8026
 [PR-8399]: https://github.com/erlang/otp/pull/8399
 
+## diameter 2.3.2.1
+
+### Improvements and New Features
+
+* Pick peer can now also handle request of type #diameter_packet\{\}.
+
+  Own Id: OTP-19090 Aux Id: PR-8399
+
 ## diameter 2.3.2
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/kernel/doc/notes.md b/lib/kernel/doc/notes.md
@@ -221,6 +221,17 @@ This document describes the changes made to the Kernel application.
 [#6724]: https://github.com/erlang/otp/issues/6724
 [PR-8396]: https://github.com/erlang/otp/pull/8396
 
+## Kernel 9.2.4.1
+
+### Fixed Bugs and Malfunctions
+
+* A call to socket:\[recv|recvfrom|recvmsg]/* with Timeout = 0 on Windows could cause a (case clause) crash if data is immediately available.
+
+  Own Id: OTP-19063 Aux Id: OTP-18835
+* Open a `disk_log` file and combining `head_func` with `rotate` options did not work.
+
+  Own Id: OTP-19104 Aux Id: ERIERL-870
+
 ## Kernel 9.2.4
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/kernel/test/disk_log_SUITE.erl b/lib/kernel/test/disk_log_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %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.

diff --git a/lib/public_key/doc/notes.md b/lib/public_key/doc/notes.md
@@ -68,6 +68,14 @@ limitations under the License.
 [PR-8026]: https://github.com/erlang/otp/pull/8026
 [PR-8233]: https://github.com/erlang/otp/pull/8233
 
+## Public_Key 1.15.1.1
+
+### Fixed Bugs and Malfunctions
+
+* Fix bug in dnsName constraint check, could cause valid cert to be considered bad during path validation.
+
+  Own Id: OTP-19100 Aux Id: GH-8482, PR-8508
+
 ## Public_Key 1.15.1
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/ssh/doc/notes.md b/lib/ssh/doc/notes.md
@@ -52,6 +52,17 @@ limitations under the License.
 [PR-7845]: https://github.com/erlang/otp/pull/7845
 [PR-8026]: https://github.com/erlang/otp/pull/8026
 
+## Ssh 5.1.4.1
+
+### Fixed Bugs and Malfunctions
+
+* With this change, ssh client will automatically adjust transfer window size for commands executed remotely over SSH.
+
+  Own Id: OTP-19057 Aux Id: PR-8345, GH-7483
+* With this change, race condition between connection closing and automatic window adjustment is fixed.
+
+  Own Id: OTP-19109 Aux Id: PR-8345
+
 ## Ssh 5.1.4
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/ssl/doc/notes.md b/lib/ssl/doc/notes.md
@@ -97,6 +97,29 @@ This document describes the changes made to the SSL application.
 [PR-8250]: https://github.com/erlang/otp/pull/8250
 [PR-8255]: https://github.com/erlang/otp/pull/8255
 
+## SSL 11.1.4.1
+
+### Fixed Bugs and Malfunctions
+
+* Check for TLS-1.3 support should check minimum requirements.
+
+  Own Id: OTP-19094 Aux Id: GH-8489
+* If both TLS-1.3 and TLS-1.2 is supported and TLS-1.2 negotiated convert TLS-1.3 ECDSA schemes to TLS-1.2 hash and signature pairs for increased interoperability.
+
+  Own Id: OTP-19107 Aux Id: GH-8376
+* TLS-1.3 negotiation now uses SNI based options correctly instead of ignoring them.
+
+  Own Id: OTP-19140
+
+### Improvements and New Features
+
+* Make it easier to distinguish between a invalid signature and unsupported signature.
+
+  Own Id: OTP-19091
+* Enhance ALERT logs to help understand what causes the alert.
+
+  Own Id: OTP-19092 Aux Id: GH-8482
+
 ## SSL 11.1.4
 
 ### Fixed Bugs and Malfunctions

diff --git a/otp_versions.table b/otp_versions.table
@@ -1,4 +1,5 @@
 OTP-27.0 : asn1-5.3 common_test-1.27 compiler-8.5 crypto-5.5 debugger-5.4 dialyzer-5.2 diameter-2.4 edoc-1.3 eldap-1.2.13 erl_interface-5.5.2 erts-15.0 et-1.7.1 eunit-2.9.1 ftp-1.2.2 inets-9.2 jinterface-1.14.1 kernel-10.0 megaco-4.6 mnesia-4.23.2 observer-2.16 odbc-2.14.3 os_mon-2.10 parsetools-2.6 public_key-1.16 reltool-1.0.1 runtime_tools-2.1 sasl-4.2.2 snmp-5.16 ssh-5.2 ssl-11.2 stdlib-6.0 syntax_tools-3.2 tftp-1.2 tools-4.0 wx-2.4.2 xmerl-2.0 # :
+OTP-26.2.5.1 : diameter-2.3.2.1 erts-14.2.5.1 kernel-9.2.4.1 public_key-1.15.1.1 ssh-5.1.4.1 ssl-11.1.4.1 # asn1-5.2.2 common_test-1.26.2 compiler-8.4.3 crypto-5.4.2 debugger-5.3.4 dialyzer-5.1.3 edoc-1.2.1 eldap-1.2.12 erl_docgen-1.5.2 erl_interface-5.5.1 et-1.7 eunit-2.9 ftp-1.2.1 inets-9.1 jinterface-1.14 megaco-4.5 mnesia-4.23.1 observer-2.15.1 odbc-2.14.2 os_mon-2.9.1 parsetools-2.5 reltool-1.0 runtime_tools-2.0.1 sasl-4.2.1 snmp-5.15 stdlib-5.2.3 syntax_tools-3.1 tftp-1.1.1 tools-3.6 wx-2.4.1 xmerl-1.3.34 :
 OTP-26.2.5 : dialyzer-5.1.3 erts-14.2.5 kernel-9.2.4 mnesia-4.23.1 ssl-11.1.4 stdlib-5.2.3 # asn1-5.2.2 common_test-1.26.2 compiler-8.4.3 crypto-5.4.2 debugger-5.3.4 diameter-2.3.2 edoc-1.2.1 eldap-1.2.12 erl_docgen-1.5.2 erl_interface-5.5.1 et-1.7 eunit-2.9 ftp-1.2.1 inets-9.1 jinterface-1.14 megaco-4.5 observer-2.15.1 odbc-2.14.2 os_mon-2.9.1 parsetools-2.5 public_key-1.15.1 reltool-1.0 runtime_tools-2.0.1 sasl-4.2.1 snmp-5.15 ssh-5.1.4 syntax_tools-3.1 tftp-1.1.1 tools-3.6 wx-2.4.1 xmerl-1.3.34 :
 OTP-26.2.4 : asn1-5.2.2 common_test-1.26.2 compiler-8.4.3 crypto-5.4.2 debugger-5.3.4 diameter-2.3.2 erts-14.2.4 kernel-9.2.3 ssh-5.1.4 ssl-11.1.3 stdlib-5.2.2 # dialyzer-5.1.2 edoc-1.2.1 eldap-1.2.12 erl_docgen-1.5.2 erl_interface-5.5.1 et-1.7 eunit-2.9 ftp-1.2.1 inets-9.1 jinterface-1.14 megaco-4.5 mnesia-4.23 observer-2.15.1 odbc-2.14.2 os_mon-2.9.1 parsetools-2.5 public_key-1.15.1 reltool-1.0 runtime_tools-2.0.1 sasl-4.2.1 snmp-5.15 syntax_tools-3.1 tftp-1.1.1 tools-3.6 wx-2.4.1 xmerl-1.3.34 :
 OTP-26.2.3 : compiler-8.4.2 crypto-5.4.1 erts-14.2.3 kernel-9.2.2 odbc-2.14.2 public_key-1.15.1 ssh-5.1.3 ssl-11.1.2 stdlib-5.2.1 wx-2.4.1 # asn1-5.2.1 common_test-1.26.1 debugger-5.3.3 dialyzer-5.1.2 diameter-2.3.1 edoc-1.2.1 eldap-1.2.12 erl_docgen-1.5.2 erl_interface-5.5.1 et-1.7 eunit-2.9 ftp-1.2.1 inets-9.1 jinterface-1.14 megaco-4.5 mnesia-4.23 observer-2.15.1 os_mon-2.9.1 parsetools-2.5 reltool-1.0 runtime_tools-2.0.1 sasl-4.2.1 snmp-5.15 syntax_tools-3.1 tftp-1.1.1 tools-3.6 xmerl-1.3.34 :