Merge branch 'maint' into master

* maint: Updated OTP version Prepare release Update copyright year
erlang · Oct 17, 2024 · 7263d1c · 7263d1c
2 parents 8ea9b33 + 8ddeb84
commit 7263d1c
Show file tree

Hide file tree

Showing 15 changed files with 148 additions and 8 deletions.
diff --git a/erts/doc/notes.md b/erts/doc/notes.md
@@ -21,6 +21,50 @@ limitations under the License.
 
 This document describes the changes made to the ERTS application.
 
+## Erts 15.1.2
+
+### Fixed Bugs and Malfunctions
+
+- A bug has been fixed where receiving an SCTP message with `gen_sctp` could waste the first fragments of a message and only deliver the last fragment.
+
+  This happened with low probability when the OS signaled that the socket was ready for reading in combination with an internal time-out retry.
+
+  A bug has been fixed with a lingering time-out from after an SCTP connect that could stop the flow of incoming messages on an active `gen_tcp` socket.
+
+  Own Id: OTP-19235 Aux Id: ERIERL-1133, [PR-8837]
+
+- An boolean option `non_block_send` for SCTP, has ben added to be able to achieve the old behaviour to avoid blocking send operations by passing the OS network stack error message (`{error,eagain}` through.
+
+  Own Id: OTP-19258 Aux Id: OTP-19061, ERIERL-1134
+
+- The call `gen_tcp:send/2` could hang indefinitely despite having set the `send_timeout` option for the following unfortunate combination of circumstances:
+
+  * The socket has to be in passive mode.
+  * All output buffers had to be filled util the `high_watermark` was hit, causing the `gen_tcp:send/2` operation to block.
+  * While the send operation was blocked, a `gen_tcp:recv/2,3` call had to be done from a different process.  It had to block, waiting for data for a while before completing the operation, and the received packet had to fill at least 75% of the receive buffer.
+
+  Under these circumstances he information that a send operation was waiting got lost, so the send operation that blocked in the first placed would never return.  The data it had would be sent, though, and send operations from other processes, still work.
+
+  This bug has been fixed.
+
+  Own Id: OTP-19267 Aux Id: [GH-6455], OTP-18520, ERIERL-1138, [PR-8892]
+
+- In rare circumstances, in code that matches multiple tuples, the JIT could generate code that would raise a `badmatch` exception even if the given tuples were correct.
+
+  Own Id: OTP-19268 Aux Id: [GH-8875], [PR-8895]
+
+- 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]
+
+[PR-8837]: https://github.com/erlang/otp/pull/8837
+[GH-6455]: https://github.com/erlang/otp/issues/6455
+[PR-8892]: https://github.com/erlang/otp/pull/8892
+[GH-8875]: https://github.com/erlang/otp/issues/8875
+[PR-8895]: https://github.com/erlang/otp/pull/8895
+[GH-8835]: https://github.com/erlang/otp/issues/8835
+[PR-8897]: https://github.com/erlang/otp/pull/8897
+
 ## Erts 15.1.1
 
 ### Fixed Bugs and Malfunctions

diff --git a/erts/vsn.mk b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 15.1.1
+VSN = 15.1.2
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3

diff --git a/lib/common_test/doc/notes.md b/lib/common_test/doc/notes.md
@@ -19,6 +19,17 @@ limitations under the License.
 -->
 # Common Test Release Notes
 
+## Common_Test 1.27.3
+
+### Fixed Bugs and Malfunctions
+
+- 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]
+
+[PR-8876]: https://github.com/erlang/otp/pull/8876
+
 ## Common_Test 1.27.2
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.27.2
+COMMON_TEST_VSN = 1.27.3
diff --git a/lib/kernel/doc/notes.md b/lib/kernel/doc/notes.md
@@ -21,6 +21,24 @@ limitations under the License.
 
 This document describes the changes made to the Kernel application.
 
+## Kernel 10.1.1
+
+### Fixed Bugs and Malfunctions
+
+- A bug has been fixed where receiving an SCTP message with `gen_sctp` could waste the first fragments of a message and only deliver the last fragment.
+
+  This happened with low probability when the OS signaled that the socket was ready for reading in combination with an internal time-out retry.
+
+  A bug has been fixed with a lingering time-out from after an SCTP connect that could stop the flow of incoming messages on an active `gen_tcp` socket.
+
+  Own Id: OTP-19235 Aux Id: ERIERL-1133, [PR-8837]
+
+- An boolean option `non_block_send` for SCTP, has ben added to be able to achieve the old behaviour to avoid blocking send operations by passing the OS network stack error message (`{error,eagain}` through.
+
+  Own Id: OTP-19258 Aux Id: OTP-19061, ERIERL-1134
+
+[PR-8837]: https://github.com/erlang/otp/pull/8837
+
 ## Kernel 10.1
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
@@ -31,6 +31,8 @@
  [{<<"^10\\.0$">>,[restart_new_emulator]},
   {<<"^10\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^10\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^10\\.1$">>,[restart_new_emulator]},
+  {<<"^10\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^8\\.4$">>,[restart_new_emulator]},
   {<<"^8\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^8\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -56,6 +58,8 @@
  [{<<"^10\\.0$">>,[restart_new_emulator]},
   {<<"^10\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^10\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^10\\.1$">>,[restart_new_emulator]},
+  {<<"^10\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^8\\.4$">>,[restart_new_emulator]},
   {<<"^8\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^8\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},

diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 10.1
+KERNEL_VSN = 10.1.1
diff --git a/lib/ssh/doc/notes.md b/lib/ssh/doc/notes.md
@@ -19,6 +19,28 @@ limitations under the License.
 -->
 # SSH Release Notes
 
+## Ssh 5.2.3
+
+### 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]
+
+[GH-7550]: https://github.com/erlang/otp/issues/7550
+[PR-8766]: https://github.com/erlang/otp/pull/8766
+[GH-8223]: https://github.com/erlang/otp/issues/8223
+[PR-8854]: https://github.com/erlang/otp/pull/8854
+[PR-8226]: https://github.com/erlang/otp/pull/8226
+
 ## Ssh 5.2.2
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
@@ -1,4 +1,4 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 5.2.2
+SSH_VSN = 5.2.3
 APP_VSN    = "ssh-$(SSH_VSN)"
diff --git a/lib/ssl/doc/notes.md b/lib/ssl/doc/notes.md
@@ -21,6 +21,28 @@ limitations under the License.
 
 This document describes the changes made to the SSL application.
 
+## SSL 11.2.4
+
+### Fixed Bugs and Malfunctions
+
+- Refactor trying to also make some optimizations introduced a bug in signature algorithms checks in OTP-26.2.1. This could manifest itself in not being able to negotiate connections using certificates needing to use some TLS-1.2 compatibility legacy signature schemes.
+
+  Own Id: OTP-19249 Aux Id: ERIERL-1137, [PR-8866]
+
+- 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]
+
+- Fix assertion so that works as intended.
+  This could result in that some TLS-1.2 clients would fail to connect to the the erlang server.  Bug introduced in OTP-27.1.1
+
+  Own Id: OTP-19288 Aux Id: [GH-8908], [PR-8916]
+
+[PR-8866]: https://github.com/erlang/otp/pull/8866
+[PR-8901]: https://github.com/erlang/otp/pull/8901
+[GH-8908]: https://github.com/erlang/otp/issues/8908
+[PR-8916]: https://github.com/erlang/otp/pull/8916
+
 ## SSL 11.2.3
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 11.2.3
+SSL_VSN = 11.2.4
diff --git a/lib/stdlib/doc/notes.md b/lib/stdlib/doc/notes.md
@@ -21,6 +21,22 @@ limitations under the License.
 
 This document describes the changes made to the STDLIB application.
 
+## STDLIB 6.1.2
+
+### Fixed Bugs and Malfunctions
+
+- 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]
+
+- Fixed spec for `json:format/3`.
+
+  Own Id: OTP-19286 Aux Id: [GH-8880], [PR-8914]
+
+[PR-8890]: https://github.com/erlang/otp/pull/8890
+[GH-8880]: https://github.com/erlang/otp/issues/8880
+[PR-8914]: https://github.com/erlang/otp/pull/8914
+
 ## STDLIB 6.1.1
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
@@ -55,7 +55,8 @@
   {<<"^6\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^6\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^6\\.1$">>,[restart_new_emulator]},
-  {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
+  {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
  [{<<"^4\\.0$">>,[restart_new_emulator]},
   {<<"^4\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -83,4 +84,5 @@
   {<<"^6\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^6\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^6\\.1$">>,[restart_new_emulator]},
-  {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
+  {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 6.1.1
+STDLIB_VSN = 6.1.2
diff --git a/otp_versions.table b/otp_versions.table
@@ -1,3 +1,4 @@
+OTP-27.1.2 : common_test-1.27.3 erts-15.1.2 kernel-10.1.1 ssh-5.2.3 ssl-11.2.4 stdlib-6.1.2 # asn1-5.3.1 compiler-8.5.2 crypto-5.5.1 debugger-5.4 dialyzer-5.2.1 diameter-2.4.1 edoc-1.3.2 eldap-1.2.13 erl_interface-5.5.2 et-1.7.1 eunit-2.9.1 ftp-1.2.3 inets-9.3 jinterface-1.14.1 megaco-4.6 mnesia-4.23.2 observer-2.16 odbc-2.15 os_mon-2.10 parsetools-2.6 public_key-1.16.3 reltool-1.0.1 runtime_tools-2.1.1 sasl-4.2.2 snmp-5.17 syntax_tools-3.2.1 tftp-1.2.1 tools-4.1 wx-2.4.3 xmerl-2.1 :
 OTP-27.1.1 : common_test-1.27.2 erts-15.1.1 public_key-1.16.3 ssl-11.2.3 stdlib-6.1.1 # asn1-5.3.1 compiler-8.5.2 crypto-5.5.1 debugger-5.4 dialyzer-5.2.1 diameter-2.4.1 edoc-1.3.2 eldap-1.2.13 erl_interface-5.5.2 et-1.7.1 eunit-2.9.1 ftp-1.2.3 inets-9.3 jinterface-1.14.1 kernel-10.1 megaco-4.6 mnesia-4.23.2 observer-2.16 odbc-2.15 os_mon-2.10 parsetools-2.6 reltool-1.0.1 runtime_tools-2.1.1 sasl-4.2.2 snmp-5.17 ssh-5.2.2 syntax_tools-3.2.1 tftp-1.2.1 tools-4.1 wx-2.4.3 xmerl-2.1 :
 OTP-27.1 : asn1-5.3.1 common_test-1.27.1 compiler-8.5.2 crypto-5.5.1 dialyzer-5.2.1 diameter-2.4.1 edoc-1.3.2 erts-15.1 ftp-1.2.3 inets-9.3 kernel-10.1 odbc-2.15 public_key-1.16.2 runtime_tools-2.1.1 snmp-5.17 ssh-5.2.2 ssl-11.2.2 stdlib-6.1 syntax_tools-3.2.1 tftp-1.2.1 tools-4.1 wx-2.4.3 xmerl-2.1 # debugger-5.4 eldap-1.2.13 erl_interface-5.5.2 et-1.7.1 eunit-2.9.1 jinterface-1.14.1 megaco-4.6 mnesia-4.23.2 observer-2.16 os_mon-2.10 parsetools-2.6 reltool-1.0.1 sasl-4.2.2 :
 OTP-27.0.1 : compiler-8.5.1 edoc-1.3.1 erts-15.0.1 kernel-10.0.1 public_key-1.16.1 ssh-5.2.1 ssl-11.2.1 stdlib-6.0.1 # asn1-5.3 common_test-1.27 crypto-5.5 debugger-5.4 dialyzer-5.2 diameter-2.4 eldap-1.2.13 erl_interface-5.5.2 et-1.7.1 eunit-2.9.1 ftp-1.2.2 inets-9.2 jinterface-1.14.1 megaco-4.6 mnesia-4.23.2 observer-2.16 odbc-2.14.3 os_mon-2.10 parsetools-2.6 reltool-1.0.1 runtime_tools-2.1 sasl-4.2.2 snmp-5.16 syntax_tools-3.2 tftp-1.2 tools-4.0 wx-2.4.2 xmerl-2.0 :