aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2019-02-18Merge branch 'maint'Ingela Anderton Andin
Conflicts: lib/ssl/src/dtls_connection.erl lib/ssl/src/ssl_connection.erl lib/ssl/src/ssl_connection.hrl lib/ssl/src/tls_connection.erl
2019-02-18Merge branch 'ingela/ssl/shrink-state' into maintIngela Anderton Andin
* ingela/ssl/shrink-state: ssl: Remove duplicate record_cb handling ssl: Add test case for continued handshake with a timeout ssl: Use gen_statem named timers to handle connection and recv timeouts ssl: Move and rename diffie_hellman_keys and srp_keys to kex_keys ssl: Move key_algorithm to handshake_env ssl: srp ssl: Rename ssl: Move diffie_hellman_params to handshake_env ssl: Move and rename psk_identity state record field ssl: Move premaster_secret to handshake_env ssl: Make flight_state DTLS specific ssl: Add private_key to connection_env ssl: Remove unused record field ssl: Add erl_dist_handle to connection_env ssl: Add negotiated_version to connection_env ssl: Add key exchange items to handshake_env ssl: Add hashsign_algorithm and cert_hashsign_algorithm to handshake_env ssl: Add downgrade handling to connection_env ssl: Create connection_env ssl: Handle renegotiation and extensions in handshake_env
2019-02-18Merge branch 'maint'Hans Nilsson
* maint: crypto: Fix of engine_SUITE:engine_list test case
2019-02-18Merge branch 'hans/crypto/cuddle_tests' into maintHans Nilsson
* hans/crypto/cuddle_tests: crypto: Fix of engine_SUITE:engine_list test case
2019-02-18crypto: Fix of engine_SUITE:engine_list test caseHans Nilsson
2019-02-18Merge branch 'maint'Hans Bolinder
* maint: Update primary bootstrap stdlib: Optimize formatted printing of terms Conflicts: bootstrap/lib/stdlib/ebin/io_lib.beam bootstrap/lib/stdlib/ebin/io_lib_format.beam bootstrap/lib/stdlib/ebin/io_lib_pretty.beam
2019-02-18Merge branch 'hasse/stdlib/optimize_pretty_print/ERIERL-306/OTP-15573' into ↵Hans Bolinder
maint * hasse/stdlib/optimize_pretty_print/ERIERL-306/OTP-15573: Update primary bootstrap stdlib: Optimize formatted printing of terms
2019-02-15Merge branch 'maint'Sverker Eriksson
2019-02-15Merge PR-2139 from sverker/ets-doc-partially-bound-key/OTP-15545Sverker Eriksson
Add ETS docs about partially bound key traversal
2019-02-15Merge branch 'maint'Siri Hansen
* maint: Updated OTP version Prepare release
2019-02-15Merge branch 'maint-20' into maintSiri Hansen
* maint-20: Updated OTP version Prepare release
2019-02-15Updated OTP versionOTP-20.3.8.20Erlang/OTP
2019-02-15Prepare releaseErlang/OTP
2019-02-15Merge branch ↵Erlang/OTP
'siri/ct/post_end_per_testcase-change-status/ERIERL-282/OTP-15584' into maint-20 * siri/ct/post_end_per_testcase-change-status/ERIERL-282/OTP-15584: [ct] Allow post_end_per_testcase hook to change tc status after timetrap
2019-02-15Update primary bootstrapHans Bolinder
2019-02-15Merge branch 'maint'Siri Hansen
2019-02-15Merge branch ↵Siri Hansen
'siri/ct/post_end_per_testcase-change-status/ERIERL-282/OTP-15584' into maint * siri/ct/post_end_per_testcase-change-status/ERIERL-282/OTP-15584: [ct] Allow post_end_per_testcase hook to change tc status after timetrap
2019-02-15Merge branch 'maint'Raimo Niskanen
Conflicts: erts/preloaded/ebin/prim_inet.beam
2019-02-15Merge branch 'raimo/erts/gen_tcp-listen-linger-slow/ERIERL-303/OTP-14728' ↵Raimo Niskanen
into maint * raimo/erts/gen_tcp-listen-linger-slow/ERIERL-303/OTP-14728: Check empty_out_q at close also for linger Conflicts: erts/preloaded/ebin/prim_inet.beam
2019-02-15Update primary bootstrapBjörn Gustavsson
2019-02-15Merge branch 'bjorn/compiler/beam_ssa_opt'Björn Gustavsson
* bjorn/compiler/beam_ssa_opt: Make sure that beam_ssa_opt optimizes all functions
2019-02-15Merge pull request #2142 from ↵Björn Gustavsson
bjorng/bjorn/erts/revert-optional-tuple-calls/OTP-15581 Remove support for optional tuple calls
2019-02-15Merge branch 'maint'Björn Gustavsson
* maint: Add persistent_term:get(Key, DefaultValue) Make dialyzer faster for left-associative andalso/orelse expressions
2019-02-15Merge pull request #2140 from ↵Björn Gustavsson
bjorng/bjorn/erts/persistent_term-default/ERL-843/OTP-15576 Add persistent_term:get(Key, DefaultValue)
2019-02-15Merge pull request #2141 from ↵Björn Gustavsson
bjorng/bjorn/compiler/left-assoc-performance/ERL-851/OTP-15577 Make dialyzer faster for left-associative andalso/orelse expressions
2019-02-15Make sure that beam_ssa_opt optimizes all functionsBjörn Gustavsson
The function `get_call_order_po/2` did not always include all functions in a module. The method it used was to first find all leave functions (functions not calling any other function), and then find all others functions that called any of the leave functions either directly or indirectly. Functions that did not call a leave function (directly or indirectly) would not be included in the list of functions to optimize. Reimplement `get_call_order_po/2` to use the standard algorithm for constructing a list of nodes in reverse postorder and then reverse that list.
2019-02-14Merge branch 'maint'Kjell Winblad
2019-02-14Merge pull request #2118 from kjellwinblad/fix_valgrind_problem_bignum OTP-15583Kjell Winblad
Fix bug in binary:encode_unsigned causing a read of uninitialized memory
2019-02-14Merge branch 'peterdmv/ssl/server-process-client-finished'Péter Dimitrov
* peterdmv/ssl/server-process-client-finished: ssl: Test TLS 1.3 connectivity ssl: Fix crash when sending Alerts ssl: Fix dialyzer warning ssl: Improve TLS 1.3 statem Change-Id: I258e0309ba3a132d5ab2056151935a3df8646344
2019-02-14ssl: Remove duplicate record_cb handlingIngela Anderton Andin
2019-02-14Merge branch 'maint'Anders Svensson
* maint: Updated OTP version Prepare release
2019-02-14stdlib: Optimize formatted printing of termsHans Bolinder
Try calling iolist_size() before calling string:length(). The reason is that calls to string:length/1 are slow when the argument is not a list of integers (or contains UNICODE).
2019-02-14Merge branch 'maint-20' into maintAnders Svensson
* maint-20: Updated OTP version Prepare release
2019-02-14Updated OTP versionOTP-20.3.8.19Erlang/OTP
2019-02-14Prepare releaseErlang/OTP
2019-02-14Merge branch 'john/erts/spectre-configure-flag-otp_20/OTP-15430/ERIERL-237' ↵Erlang/OTP
into maint-20 * john/erts/spectre-configure-flag-otp_20/OTP-15430/ERIERL-237: Allow disabling retpoline in interpreter loop Add a ./configure flag for spectre mitigation
2019-02-14Merge branch 'anders/diameter/nocatch/OTP-15569' into maint-20Erlang/OTP
* anders/diameter/nocatch/OTP-15569: Update appup Fix nocatch on incoming answer with faulty Experimental-Result-Code
2019-02-14Revert "Reinstate tuple calls support in the beam emulator"Björn Gustavsson
This reverts commit 87da7b5be69de01e65df566c6e35064381d1144d.
2019-02-14Revert "Add -ztma option for enabling tuple calls"Björn Gustavsson
This reverts commit ea0e763e953f9c7d1fa9c142f24cb95f56119c56.
2019-02-14Merge branch 'maint'Björn Gustavsson
* maint: Add -ztma option for enabling tuple calls Reinstate tuple calls support in the beam emulator
2019-02-14ssl: Add test case for continued handshake with a timeoutdimadio
2019-02-14Merge pull request #2113 from richcarl/optional-tuple-callsBjörn Gustavsson
Optional tuple calls OTP-15580
2019-02-14Merge branch 'maint'Péter Dimitrov
* maint: ssl: Fix renegotiation testcases ssl: Fix failing rizzo testcases ssl: Use IPv4 addresses with openssl s_client ssl: Use sha256 in test certificates if supported Change-Id: I8a604d607333d029b170e3d3ad31ea01890202ea
2019-02-14Merge branch 'peterdmv/ssl/fix-failing-testcases' into maintPéter Dimitrov
* peterdmv/ssl/fix-failing-testcases: ssl: Fix renegotiation testcases ssl: Fix failing rizzo testcases ssl: Use IPv4 addresses with openssl s_client ssl: Use sha256 in test certificates if supported Change-Id: I11a326be027545e20fbef6f90996b0c8be8c3e50
2019-02-14Merge branch 'bjorn/compiler/improve-move-elimination'Björn Gustavsson
* bjorn/compiler/improve-move-elimination: beam_jump: Improve elimination of redundant moves
2019-02-14Add persistent_term:get(Key, DefaultValue)Björn Gustavsson
https://bugs.erlang.org/browse/ERL-843
2019-02-13ssl: Fix renegotiation testcasesPéter Dimitrov
Fix failing renegotiation testcases with openssl-1.1.1a. openssl s_client sends the renegotiation "R\n" connected command to the server side causing testcase failure. This commit updates ssl_to_openssl_SUITE:erlang_ssl_receive to swallow the unexpected packet. Change-Id: I1f5d040ac65c25652f7101ddf109fc84acc4c915
2019-02-13Merge branch 'maint'Anders Svensson
2019-02-13Merge branch 'anders/diameter/nocatch/OTP-15569' into maintAnders Svensson
* anders/diameter/nocatch/OTP-15569: Update appup Fix nocatch on incoming answer with faulty Experimental-Result-Code
2019-02-13ssl: Use gen_statem named timers to handle connection and recv timeoutsIngela Anderton Andin