aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2019-06-18Merge branch 'maint-22' into maintJohn Högberg
* maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
2019-06-18Merge pull request #2272 from ↵Lukas Larsson
garazdawi/lukas/erts/fix_active_n_close_win32/ERL-960/OTP-15901 Fix {active,N} close race condition on windows
2019-06-18Merge branch 'maint-21' into maintJohn Högberg
* maint-21: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/common_test/doc/src/notes.xml # lib/common_test/vsn.mk # lib/kernel/doc/src/notes.xml # lib/kernel/vsn.mk # lib/public_key/doc/src/notes.xml # lib/public_key/vsn.mk # lib/ssl/doc/src/notes.xml # lib/ssl/vsn.mk # lib/stdlib/doc/src/notes.xml # lib/stdlib/vsn.mk # make/otp_version_tickets # otp_versions.table
2019-06-17Updated OTP versionOTP-22.0.4Erlang/OTP
2019-06-17Prepare releaseErlang/OTP
2019-06-17Merge branch 'peterdmv/ssl/fix-handshake-hello/ERL-975/OTP-15888' into maint-22Erlang/OTP
* peterdmv/ssl/fix-handshake-hello/ERL-975/OTP-15888: ssl: Fix negative tests in ssl_basic_SUITE ssl: Fix run_client_error/1 in ssl_test_lib ssl: Fix ssl_handshake:extension_value/1
2019-06-17Merge branch 'peterdmv/ssl/tls12-java11-interop/ERL-973/OTP-15887' into maint-22Erlang/OTP
* peterdmv/ssl/tls12-java11-interop/ERL-973/OTP-15887: ssl: Add interop test ssl: Improve handling of signature algorithms
2019-06-17Merge branch 'john/kernel/fix-io-proto-user-drv/OTP-15805' into maint-22Erlang/OTP
* john/kernel/fix-io-proto-user-drv/OTP-15805: kernel: Force synchronous port_commands in user/user_drv
2019-06-17Merge branch 'rickard/dist-exit2/22/OTP-15867' into maint-22Erlang/OTP
* rickard/dist-exit2/22/OTP-15867: Don't disconnect on remote exit/2 with old incarnation as recipient
2019-06-17Merge branch 'john/erts/fix-xxx_to_existing_atom-overflow/ERL-944/OTP-15819' ↵Erlang/OTP
into maint-22 * john/erts/fix-xxx_to_existing_atom-overflow/ERL-944/OTP-15819: erts: Fix buffer overflow in xxx_to_existing_atom
2019-06-17Merge branch 'ingela/ssl/handshake-handling/ERL-968/OTP-15879' into maint-22Erlang/OTP
* ingela/ssl/handshake-handling/ERL-968/OTP-15879: ssl: Correct handshake handling
2019-06-17Updated OTP versionOTP-21.3.8.4Erlang/OTP
2019-06-17Prepare releaseErlang/OTP
2019-06-17Merge branch 'rickard/dist-exit2/21/OTP-15867' into maint-21Erlang/OTP
* rickard/dist-exit2/21/OTP-15867: Don't disconnect on remote exit/2 with old incarnation as recipient
2019-06-17Merge branch ↵Erlang/OTP
'siri/ct/fail-after-failed-init_per_testcase/maint-21/ERIERL-350/OTP-15869' into maint-21 * siri/ct/fail-after-failed-init_per_testcase/maint-21/ERIERL-350/OTP-15869: [ct] Allow post_init_per_testcase to change skip to fail
2019-06-17Merge branch 'ingela/public_key/PEBS2-backport/OTP-15870' into maint-21Erlang/OTP
* ingela/public_key/PEBS2-backport/OTP-15870: public_key: Add AES to PBE2
2019-06-17Merge branch 'ingela/ssl/handshake-handling/ERL-968/OTP-15879' into maint-21Erlang/OTP
* ingela/ssl/handshake-handling/ERL-968/OTP-15879: ssl: Correct handshake handling
2019-06-17Merge branch 'hasse/stdlib/chars_limit_bug/OTP-15875/ERL-967' into maint-21Erlang/OTP
* hasse/stdlib/chars_limit_bug/OTP-15875/ERL-967: stdlib: Fix a bug concerning io_lib option 'chars_limit' # Conflicts: # lib/stdlib/test/io_SUITE.erl
2019-06-17Merge branch ↵Erlang/OTP
'siri/ct/hook-terminated-not-initiated/maint-21/ERIERL-370/OTP-15863' into maint-21 * siri/ct/hook-terminated-not-initiated/maint-21/ERIERL-370/OTP-15863: [ct] Fix bug where Hook:terminate/1 was called before Hook:init/2
2019-06-17Merge branch 'ingela/raimo/udp-send-TOS/ERIERL-294/OTP-15747' into maint-21Erlang/OTP
* ingela/raimo/udp-send-TOS/ERIERL-294/OTP-15747: Introduce udp send ancillary data argument down to inet_drv Fix old warnings
2019-06-17Merge branch ↵Erlang/OTP
'sverker/erts/process-info-reductions-idle-proc/ERL-964/OTP-15865' into maint-21 * sverker/erts/process-info-reductions-idle-proc/ERL-964/OTP-15865: erts: Improve test of process_info(reductions) Revert "erts: Force process_info(reductions) as signal"
2019-06-17Merge branch 'raimo/incomplete-socket-close/ERIERL-353/OTP-15370' into maint-21Erlang/OTP
* raimo/incomplete-socket-close/ERIERL-353/OTP-15370: Copy linger zero flag from listen socket Test linger zero flag from listen socket
2019-06-17Merge branch 'peterdmv/ssl/fix-handshake-hello/ERL-975/OTP-15888' into maintPéter Dimitrov
* peterdmv/ssl/fix-handshake-hello/ERL-975/OTP-15888: ssl: Fix negative tests in ssl_basic_SUITE ssl: Fix run_client_error/1 in ssl_test_lib ssl: Fix ssl_handshake:extension_value/1
2019-06-17ssl: Fix negative tests in ssl_basic_SUITEPéter Dimitrov
2019-06-17ssl: Fix run_client_error/1 in ssl_test_libPéter Dimitrov
Fix run_client_error/1 to properly propagate errors from the test client.
2019-06-17ssl: Fix ssl_handshake:extension_value/1Péter Dimitrov
Handle new TLS 1.2/1.3 extensions.
2019-06-17Merge branch 'john/erts/fix-conservative/OTP-15881' into maintJohn Högberg
* john/erts/fix-conservative/OTP-15881: erts: Relax the constraint introduced in OTP-15871
2019-06-17Merge branch 'rickard/dist-exit2/22/OTP-15867' into maintRickard Green
* rickard/dist-exit2/22/OTP-15867: Don't disconnect on remote exit/2 with old incarnation as recipient
2019-06-17Merge branch 'john/kernel/fix-io-proto-user-drv/OTP-15805' into maintJohn Högberg
* john/kernel/fix-io-proto-user-drv/OTP-15805: kernel: Force synchronous port_commands in user/user_drv
2019-06-17cc.sh: Optimize dependency generationBjörn Gustavsson
2019-06-17Merge pull request #2206 from alehar/inets/httpd_request_parse_headers_fixIngela Andin
inets: httpd_request - honor RFC2616 LF only as header line terminator OTP-15893
2019-06-17Merge branch 'ingela/merge-294' into maintIngela Anderton Andin
2019-06-17Merge branch 'ingela/raimo/udp-send-TOS/ERIERL-294/OTP-15747' into ↵Ingela Anderton Andin
ingela/merge-294 * ingela/raimo/udp-send-TOS/ERIERL-294/OTP-15747: Introduce udp send ancillary data argument down to inet_drv Fix old warnings
2019-06-17Merge branch 'hans/crypto/cuddle_docs' into maintHans Nilsson
* hans/crypto/cuddle_docs: crypto: Modernized 'Algorithms' section in User's Guide
2019-06-17crypto: Modernized 'Algorithms' section in User's GuideHans Nilsson
Adapted to the "New API" introduced in 22.0
2019-06-17Merge branch 'rickard/dist-exit2/21/OTP-15867' into ↵Rickard Green
rickard/dist-exit2/22/OTP-15867 * rickard/dist-exit2/21/OTP-15867: Don't disconnect on remote exit/2 with old incarnation as recipient
2019-06-17Merge branch 'ingela/public_key/PEBS2-backport/OTP-15870' into maintIngela Anderton Andin
2019-06-17Merge branch 'rickard/dist-exit2/20/OTP-15867' into ↵Rickard Green
rickard/dist-exit2/21/OTP-15867 * rickard/dist-exit2/20/OTP-15867: Don't disconnect on remote exit/2 with old incarnation as recipient
2019-06-17public_key: Add AES to PBE2Ingela Anderton Andin
2019-06-17Don't disconnect on remote exit/2 with old incarnation as recipientRickard Green
2019-06-17Introduce udp send ancillary data argument down to inet_drvRaimo Niskanen
2019-06-17Fix old warningsRaimo Niskanen
2019-06-17Merge branch 'peterdmv/ssl/tls12-java11-interop/ERL-973/OTP-15887' into maintPéter Dimitrov
* peterdmv/ssl/tls12-java11-interop/ERL-973/OTP-15887: ssl: Add interop test ssl: Improve handling of signature algorithms
2019-06-17Merge branch 'maint-20' into maintJohn Högberg
* maint-20: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/common_test/doc/src/notes.xml # lib/common_test/vsn.mk # lib/tools/doc/src/notes.xml # lib/tools/vsn.mk # make/otp_version_tickets # otp_versions.table
2019-06-17Merge branch ↵Siri Hansen
'siri/ct/fail-after-failed-init_per_testcase/maint-21/ERIERL-350/OTP-15869' into maint * siri/ct/fail-after-failed-init_per_testcase/maint-21/ERIERL-350/OTP-15869: [ct] Allow post_init_per_testcase to change skip to fail
2019-06-17[ct] Allow post_init_per_testcase to change skip to failSiri Hansen
2019-06-17Merge pull request #2289 from gomoripeti/doc_message_in_traceLukas Larsson
Document extra message element also where trace message format is described
2019-06-16Document extra message element also where trace message format is describedPéter Gömöri
2019-06-14ssl: Add interop testPéter Dimitrov
Add interoperability test for TLS 1.2 server and TLS 1.3 client.
2019-06-14ssl: Improve handling of signature algorithmsPéter Dimitrov
TLS 1.2 ClientHello caused handshake failure in the TLS 1.2 server if the signature_algorithms_cert extension contained legacy algorithms. Update TLS 1.2 server to properly handle legacy signature algorithms in the signature_algorithms_cert extension. Update TLS 1.3 client so that it can send legacy algorithms in its signature_algorithms_cert extension.