diff options
author | Ingela Anderton Andin <ingela@erlang.org> | 2023-02-23 10:59:18 +0100 |
---|---|---|
committer | Ingela Anderton Andin <ingela@erlang.org> | 2023-02-23 10:59:18 +0100 |
commit | 85ef84debe8d61d066124877059e30f3430f92de (patch) | |
tree | 99fe491a76fd51227bff3807b723f6540a8198ba | |
parent | 205da375ece39099464ca7c2c1e600021a3a1b02 (diff) | |
parent | 68522e556c020de5fe7e20c4c082927a5d04d8e7 (diff) | |
download | erlang-85ef84debe8d61d066124877059e30f3430f92de.tar.gz |
Merge branch 'maint-24' into maint
* maint-24:
Updated OTP version
Prepare release
Update copyright year
-rw-r--r-- | erts/doc/src/notes.xml | 24 | ||||
-rw-r--r-- | erts/emulator/beam/emu/bs_instrs.tab | 2 | ||||
-rw-r--r-- | erts/emulator/beam/emu/instrs.tab | 2 | ||||
-rw-r--r-- | erts/emulator/beam/emu/macros.tab | 2 | ||||
-rw-r--r-- | erts/emulator/beam/erl_gc.c | 2 | ||||
-rw-r--r-- | erts/emulator/beam/jit/x86/beam_asm_global.cpp | 2 | ||||
-rw-r--r-- | erts/emulator/test/process_SUITE.erl | 2 | ||||
-rw-r--r-- | erts/etc/unix/cerl.src | 2 | ||||
-rw-r--r-- | lib/compiler/doc/src/notes.xml | 22 | ||||
-rw-r--r-- | lib/compiler/src/v3_core.erl | 2 | ||||
-rw-r--r-- | lib/compiler/test/match_SUITE.erl | 2 | ||||
-rw-r--r-- | lib/compiler/test/warnings_SUITE.erl | 2 | ||||
-rw-r--r-- | lib/inets/doc/src/notes.xml | 17 | ||||
-rw-r--r-- | lib/inets/src/http_server/mod_alias.erl | 2 | ||||
-rw-r--r-- | lib/inets/test/httpd_SUITE.erl | 2 | ||||
-rw-r--r-- | lib/ssh/doc/src/notes.xml | 24 | ||||
-rw-r--r-- | lib/ssl/doc/src/notes.xml | 26 | ||||
-rw-r--r-- | make/otp_version_tickets_in_merge | 8 | ||||
-rw-r--r-- | otp_versions.table | 1 |
19 files changed, 126 insertions, 20 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index 4acebeebf0..883b1e4746 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -1228,6 +1228,30 @@ </section> +<section><title>Erts 12.3.2.9</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + <c>process_info(Pid, status)</c> when <c>Pid /= + self()</c> could return an erroneous result.</p> + <p> + Own Id: OTP-18421 Aux Id: PR-6806 </p> + </item> + <item> + <p>In rare circumstances, when a process exceeded its + allowed heap size set by option <c>max_heap_size</c>, it + would not be killed as it should be, but instead enter a + kind of zombie state it would never get out of.</p> + <p> + Own Id: OTP-18463 Aux Id: PR-6858 </p> + </item> + </list> + </section> + +</section> + <section><title>Erts 12.3.2.8</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/erts/emulator/beam/emu/bs_instrs.tab b/erts/emulator/beam/emu/bs_instrs.tab index b5fa518312..54ecc2648e 100644 --- a/erts/emulator/beam/emu/bs_instrs.tab +++ b/erts/emulator/beam/emu/bs_instrs.tab @@ -2,7 +2,7 @@ // // %CopyrightBegin% // -// Copyright Ericsson AB 2017-2021. All Rights Reserved. +// Copyright Ericsson AB 2017-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/erts/emulator/beam/emu/instrs.tab b/erts/emulator/beam/emu/instrs.tab index 0ca0d71a2d..2c794aa4b0 100644 --- a/erts/emulator/beam/emu/instrs.tab +++ b/erts/emulator/beam/emu/instrs.tab @@ -2,7 +2,7 @@ // // %CopyrightBegin% // -// Copyright Ericsson AB 2017-2022. All Rights Reserved. +// Copyright Ericsson AB 2017-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/erts/emulator/beam/emu/macros.tab b/erts/emulator/beam/emu/macros.tab index b65e01553a..c4353583ef 100644 --- a/erts/emulator/beam/emu/macros.tab +++ b/erts/emulator/beam/emu/macros.tab @@ -2,7 +2,7 @@ // // %CopyrightBegin% // -// Copyright Ericsson AB 2017-2021. All Rights Reserved. +// Copyright Ericsson AB 2017-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/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c index e2c9944894..2bb41685bd 100644 --- a/erts/emulator/beam/erl_gc.c +++ b/erts/emulator/beam/erl_gc.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2002-2022. All Rights Reserved. + * Copyright Ericsson AB 2002-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/erts/emulator/beam/jit/x86/beam_asm_global.cpp b/erts/emulator/beam/jit/x86/beam_asm_global.cpp index 3e588d3d45..ec38e05323 100644 --- a/erts/emulator/beam/jit/x86/beam_asm_global.cpp +++ b/erts/emulator/beam/jit/x86/beam_asm_global.cpp @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2020-2022. All Rights Reserved. + * Copyright Ericsson AB 2020-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/erts/emulator/test/process_SUITE.erl b/erts/emulator/test/process_SUITE.erl index 89d37d4f3e..7d45d66f89 100644 --- a/erts/emulator/test/process_SUITE.erl +++ b/erts/emulator/test/process_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2022. All Rights Reserved. +%% Copyright Ericsson AB 1997-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/erts/etc/unix/cerl.src b/erts/etc/unix/cerl.src index 12b742883f..8046cee347 100644 --- a/erts/etc/unix/cerl.src +++ b/erts/etc/unix/cerl.src @@ -2,7 +2,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2003-2022. All Rights Reserved. +# Copyright Ericsson AB 2003-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/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml index 0687d079ab..9393980039 100644 --- a/lib/compiler/doc/src/notes.xml +++ b/lib/compiler/doc/src/notes.xml @@ -361,6 +361,28 @@ </section> +<section><title>Compiler 8.1.1.3</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p>The compiler would generate incorrect code for the + following type of expression:</p> + <p><c>Pattern = BoundVar1 = . . . = BoundVarN = + Expression</c></p> + <p>An exception should be raised if any of the bound + variables have different values than <c>Expression</c>. + The compiler would generate code that would cause the + bound variables to be bound to the value of + <c>Expression</c>whether the value matched or not.</p> + <p> + Own Id: OTP-18470 Aux Id: GH-6873, PR-6877 </p> + </item> + </list> + </section> + +</section> + <section><title>Compiler 8.1.1.2</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/compiler/src/v3_core.erl b/lib/compiler/src/v3_core.erl index 59705de120..ff7a48e002 100644 --- a/lib/compiler/src/v3_core.erl +++ b/lib/compiler/src/v3_core.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2021. All Rights Reserved. +%% Copyright Ericsson AB 1999-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/compiler/test/match_SUITE.erl b/lib/compiler/test/match_SUITE.erl index 08b9fe7699..c10e3158e1 100644 --- a/lib/compiler/test/match_SUITE.erl +++ b/lib/compiler/test/match_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2021. All Rights Reserved. +%% Copyright Ericsson AB 2004-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/compiler/test/warnings_SUITE.erl b/lib/compiler/test/warnings_SUITE.erl index 48a9bdf8cb..5f61485b4c 100644 --- a/lib/compiler/test/warnings_SUITE.erl +++ b/lib/compiler/test/warnings_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2003-2022. All Rights Reserved. +%% Copyright Ericsson AB 2003-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/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index e8843e5895..a27dea627a 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -214,6 +214,23 @@ </section> + <section><title>Inets 7.5.3.2</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + With this change, handling of URI to a folder, with + missing trailing / and a query component present is + fixed.</p> + <p> + Own Id: OTP-18472 Aux Id: DAFH-1592 </p> + </item> + </list> + </section> + +</section> + <section><title>Inets 7.5.3.1</title> <section><title>Improvements and New Features</title> diff --git a/lib/inets/src/http_server/mod_alias.erl b/lib/inets/src/http_server/mod_alias.erl index c2365484a6..ef6e928058 100644 --- a/lib/inets/src/http_server/mod_alias.erl +++ b/lib/inets/src/http_server/mod_alias.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2021. All Rights Reserved. +%% Copyright Ericsson AB 1997-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/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl index 157e993628..1df6251d41 100644 --- a/lib/inets/test/httpd_SUITE.erl +++ b/lib/inets/test/httpd_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2013-2022. All Rights Reserved. +%% Copyright Ericsson AB 2013-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/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index a2b1a24113..efed2888f5 100644 --- a/lib/ssh/doc/src/notes.xml +++ b/lib/ssh/doc/src/notes.xml @@ -178,6 +178,30 @@ </section> +<section><title>Ssh 4.13.2.2</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + With this change, ssh application does not crash when + formatting some of info reports for unsuccessful + connections.</p> + <p> + Own Id: OTP-18386 Aux Id: PR-6611 </p> + </item> + <item> + <p> + With this change, ssh does not log extensively long + messages.</p> + <p> + Own Id: OTP-18417 Aux Id: DAFH-1349,ERIERL-888,IA18357 </p> + </item> + </list> + </section> + +</section> + <section><title>Ssh 4.13.2.1</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 3415c2b380..18bfe77a96 100644 --- a/lib/ssl/doc/src/notes.xml +++ b/lib/ssl/doc/src/notes.xml @@ -379,6 +379,32 @@ </section> +<section><title>SSL 10.7.3.6</title> + + <section><title>Improvements and New Features</title> + <list> + <item> + <p> + Maximize compatibility by ignoring change_cipher_spec + during handshake even if middle_box_mode is not + negotiated (mandated by client)</p> + <p> + Own Id: OTP-18433 Aux Id: GH-6772 </p> + </item> + <item> + <p> + Move assert of middlebox message after an + hello_retry_request to maximize interoperability. Does + not changes semantics of the protocol only allows + unexpected message delay from server.</p> + <p> + Own Id: OTP-18467 Aux Id: GH-6807 </p> + </item> + </list> + </section> + +</section> + <section><title>SSL 10.7.3.5</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index b0a12220b7..e69de29bb2 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,8 +0,0 @@ -OTP-18386 -OTP-18415 -OTP-18417 -OTP-18421 -OTP-18433 -OTP-18461 -OTP-18462 -OTP-18467 diff --git a/otp_versions.table b/otp_versions.table index 4cb0d38575..9d4bc4abc1 100644 --- a/otp_versions.table +++ b/otp_versions.table @@ -11,6 +11,7 @@ OTP-25.0.3 : erts-13.0.3 ssl-10.8.3 # asn1-5.0.19 common_test-1.23 compiler-8.2 OTP-25.0.2 : erts-13.0.2 ssl-10.8.2 # asn1-5.0.19 common_test-1.23 compiler-8.2 crypto-5.1.1 debugger-5.3 dialyzer-5.0.1 diameter-2.2.6 edoc-1.2 eldap-1.2.10 erl_docgen-1.3 erl_interface-5.3 et-1.6.5 eunit-2.7.1 ftp-1.1.1 inets-8.0 jinterface-1.13 kernel-8.4.1 megaco-4.4 mnesia-4.21.1 observer-2.12 odbc-2.14 os_mon-2.7.1 parsetools-2.4 public_key-1.13 reltool-0.9 runtime_tools-1.19 sasl-4.2 snmp-5.13 ssh-4.14.1 stdlib-4.0.1 syntax_tools-3.0 tftp-1.0.3 tools-3.5.3 wx-2.2 xmerl-1.3.29 : OTP-25.0.1 : crypto-5.1.1 dialyzer-5.0.1 erts-13.0.1 kernel-8.4.1 mnesia-4.21.1 ssh-4.14.1 ssl-10.8.1 stdlib-4.0.1 # asn1-5.0.19 common_test-1.23 compiler-8.2 debugger-5.3 diameter-2.2.6 edoc-1.2 eldap-1.2.10 erl_docgen-1.3 erl_interface-5.3 et-1.6.5 eunit-2.7.1 ftp-1.1.1 inets-8.0 jinterface-1.13 megaco-4.4 observer-2.12 odbc-2.14 os_mon-2.7.1 parsetools-2.4 public_key-1.13 reltool-0.9 runtime_tools-1.19 sasl-4.2 snmp-5.13 syntax_tools-3.0 tftp-1.0.3 tools-3.5.3 wx-2.2 xmerl-1.3.29 : OTP-25.0 : asn1-5.0.19 common_test-1.23 compiler-8.2 crypto-5.1 debugger-5.3 dialyzer-5.0 diameter-2.2.6 edoc-1.2 erl_docgen-1.3 erl_interface-5.3 erts-13.0 eunit-2.7.1 inets-8.0 jinterface-1.13 kernel-8.4 megaco-4.4 mnesia-4.21 observer-2.12 odbc-2.14 parsetools-2.4 public_key-1.13 runtime_tools-1.19 sasl-4.2 snmp-5.13 ssh-4.14 ssl-10.8 stdlib-4.0 syntax_tools-3.0 tools-3.5.3 wx-2.2 xmerl-1.3.29 # eldap-1.2.10 et-1.6.5 ftp-1.1.1 os_mon-2.7.1 reltool-0.9 tftp-1.0.3 : +OTP-24.3.4.9 : compiler-8.1.1.3 erts-12.3.2.9 inets-7.5.3.2 ssh-4.13.2.2 ssl-10.7.3.6 # asn1-5.0.18.1 common_test-1.22.1.1 crypto-5.0.6.3 debugger-5.2.1 dialyzer-4.4.4.1 diameter-2.2.5 edoc-1.1 eldap-1.2.10 erl_docgen-1.2.1 erl_interface-5.2.2 et-1.6.5 eunit-2.7 ftp-1.1.1 jinterface-1.12.2 kernel-8.3.2.3 megaco-4.3 mnesia-4.20.4.2 observer-2.11.1 odbc-2.13.5 os_mon-2.7.1 parsetools-2.3.2 public_key-1.12.0.1 reltool-0.9 runtime_tools-1.18 sasl-4.1.2 snmp-5.12.0.2 stdlib-3.17.2.2 syntax_tools-2.6 tftp-1.0.3 tools-3.5.2 wx-2.1.4 xmerl-1.3.28 : OTP-24.3.4.8 : erts-12.3.2.8 snmp-5.12.0.2 # asn1-5.0.18.1 common_test-1.22.1.1 compiler-8.1.1.2 crypto-5.0.6.3 debugger-5.2.1 dialyzer-4.4.4.1 diameter-2.2.5 edoc-1.1 eldap-1.2.10 erl_docgen-1.2.1 erl_interface-5.2.2 et-1.6.5 eunit-2.7 ftp-1.1.1 inets-7.5.3.1 jinterface-1.12.2 kernel-8.3.2.3 megaco-4.3 mnesia-4.20.4.2 observer-2.11.1 odbc-2.13.5 os_mon-2.7.1 parsetools-2.3.2 public_key-1.12.0.1 reltool-0.9 runtime_tools-1.18 sasl-4.1.2 ssh-4.13.2.1 ssl-10.7.3.5 stdlib-3.17.2.2 syntax_tools-2.6 tftp-1.0.3 tools-3.5.2 wx-2.1.4 xmerl-1.3.28 : OTP-24.3.4.7 : common_test-1.22.1.1 compiler-8.1.1.2 erts-12.3.2.7 kernel-8.3.2.3 mnesia-4.20.4.2 snmp-5.12.0.1 stdlib-3.17.2.2 # asn1-5.0.18.1 crypto-5.0.6.3 debugger-5.2.1 dialyzer-4.4.4.1 diameter-2.2.5 edoc-1.1 eldap-1.2.10 erl_docgen-1.2.1 erl_interface-5.2.2 et-1.6.5 eunit-2.7 ftp-1.1.1 inets-7.5.3.1 jinterface-1.12.2 megaco-4.3 observer-2.11.1 odbc-2.13.5 os_mon-2.7.1 parsetools-2.3.2 public_key-1.12.0.1 reltool-0.9 runtime_tools-1.18 sasl-4.1.2 ssh-4.13.2.1 ssl-10.7.3.5 syntax_tools-2.6 tftp-1.0.3 tools-3.5.2 wx-2.1.4 xmerl-1.3.28 : OTP-24.3.4.6 : asn1-5.0.18.1 dialyzer-4.4.4.1 erts-12.3.2.6 kernel-8.3.2.2 ssl-10.7.3.5 # common_test-1.22.1 compiler-8.1.1.1 crypto-5.0.6.3 debugger-5.2.1 diameter-2.2.5 edoc-1.1 eldap-1.2.10 erl_docgen-1.2.1 erl_interface-5.2.2 et-1.6.5 eunit-2.7 ftp-1.1.1 inets-7.5.3.1 jinterface-1.12.2 megaco-4.3 mnesia-4.20.4.1 observer-2.11.1 odbc-2.13.5 os_mon-2.7.1 parsetools-2.3.2 public_key-1.12.0.1 reltool-0.9 runtime_tools-1.18 sasl-4.1.2 snmp-5.12 ssh-4.13.2.1 stdlib-3.17.2.1 syntax_tools-2.6 tftp-1.0.3 tools-3.5.2 wx-2.1.4 xmerl-1.3.28 : |