aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-14Merge pull request #2113 from richcarl/optional-tuple-callsBjörn Gustavsson
Optional tuple calls OTP-15580
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-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 '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: Fix failing rizzo testcasesPéter Dimitrov
Filter out the cipher 'chacha20_poly1305' when running the testcase 'rizzo_one_n_minus_one'. Change-Id: If3a18b0782b747b91155553e0659faebd7c5dd05
2019-02-13ssl: Use IPv4 addresses with openssl s_clientPéter Dimitrov
This commit fixes failing testcases on OpenBSD 12.0 systems. It forces openssl s_client to use an IPv4 address if openssl supports IPv6. When s_client is called with the argument "localhost" it binds to the first address returned by getaddrinfo. As the first address is an IPv6 address on OpenBSD 12.0, the client fails to send UDP packets to the ssl server that is listening on an IPv4 address. Change-Id: Ie662d10f4f0d9c803f7a341c9ea7dbe2ac80b556
2019-02-12Update appupAnders Svensson
For OTP-15569, to be released in OTP 20.3.8.19.
2019-02-12Merge branch 'FNickRU/stdlib/optimize_calendar/PR-2121/OTP-15572' into maintHans Bolinder
* FNickRU/stdlib/optimize_calendar/PR-2121/OTP-15572: Optimize calendar:gregorian_days_to_date/1
2019-02-11ssl: Use sha256 in test certificates if supportedPéter Dimitrov
This commit fixes ssl_test_lib:appropriate_sha/1 that returns sha256 if it is supported by crypto. It returns sha1 otherwise. Change-Id: I0bfa4d50bbe3c788551a81d418db2cabc36a4344
2019-02-11Merge branch 'siri/observer/crash-toggle-log-view/OTP-15553' into maintSiri Hansen
* siri/observer/crash-toggle-log-view/OTP-15553: [observer] Don't crash on Log > Toggle Log View
2019-02-11Merge branch 'sverker/enif_select-faulty-assert' into maintSverker Eriksson
* sverker/enif_select-faulty-assert: erts: Fix faulty debug assert in enif_select
2019-02-11Merge branch 'sverker/map-from-ks-vs-bug/OTP-15567' into maintSverker Eriksson
* sverker/map-from-ks-vs-bug/OTP-15567: erts: Add test for bug in enif_make_maps_from_arrays erts: Fix bug in erts_map_from_ks_and_vs
2019-02-11Merge branch 'siri/ct_netconfc/edit-config-list/OTP-15298' into maintSiri Hansen
* siri/ct_netconfc/edit-config-list/OTP-15298: [ct] Allow ct_netconfc:edit_config/3,4,5 to take a list of XML elements
2019-02-11Merge branch 'siri/ct_telnet/div-improvements/OTP-15229' into maintSiri Hansen
* siri/ct_telnet/div-improvements/OTP-15229: [ct] Add option {newline,string()} to ct_telnet:cmd and ct_telnet:send [ct] Improve error handling of bad regular expressions to ct_telnet
2019-02-11Merge branch 'dialyzer/hasse/fix_bug_erl_bif_types/OTP-15570' into maintHans Bolinder
* dialyzer/hasse/fix_bug_erl_bif_types/OTP-15570: dialyzer: Fix a bug affecting keyfind/keysearch/keymember
2019-02-08Fix nocatch on incoming answer with faulty Experimental-Result-CodeAnders Svensson
Failure to decode the Grouped AVP results in a throw from module diameter_gen, which is caught in the normal message decode, but wasn't when only the AVP is decoded from diameter_traffic (for error checking and counter increment). The result was no handle_answer/error callback, and an error return from diameter:call/4 when the detach option was not specified.
2019-02-08dialyzer: Fix a bug affecting keyfind/keysearch/keymemberHans Bolinder
2019-02-06erts: Fix faulty debug assert in enif_selectSverker Eriksson
2019-02-06erts: Add test for bug in enif_make_maps_from_arraysSverker Eriksson
2019-02-06Merge tag 'OTP-21.2' into sverker/map-from-ks-vs-bugSverker Eriksson
2019-02-06erts: Fix bug in erts_map_from_ks_and_vsSverker Eriksson
This sleeping bug was introduced in OTP 19.1 but not possible not provoke until OTP 21.0 when enif_make_map_from_arrays was introduced.
2019-02-06Merge branch 'rickard/ei-ext-maint/OTP-15442' into maintRickard Green
* rickard/ei-ext-maint/OTP-15442: Introduce ei_init() Fix bug in ei_accept_tmo Fix build of erl_interface on BSD
2019-02-06Merge branch 'sverker/fix-compile-warning' into maintSverker Eriksson
* sverker/fix-compile-warning: erts: Fix compiler warning for IS_SSMALL
2019-02-05Merge branch 'rickard/ei-ext/OTP-15442' into rickard/ei-ext-maint/OTP-15442Rickard Green
* rickard/ei-ext/OTP-15442: Introduce ei_init() Fix bug in ei_accept_tmo Fix build of erl_interface on BSD
2019-02-05Introduce ei_init()Rickard Green
You previously had to initialize ei via erl_init() which implied that you were forced to link against the erl_interface even when not using it (besides initializing ei).
2019-02-05Merge branch 'ingela/ssl/alert-return/OTP-15423' into maintIngela Anderton Andin
* ingela/ssl/alert-return/OTP-15423: ssl: Use specs to generate type documentation ssl: Enhance error handling
2019-02-05Merge branch 'ingela/ssl/dtls-match-error/OTP-15561' into maintIngela Anderton Andin
* ingela/ssl/dtls-match-error/OTP-15561: ssl: Remove unintended match
2019-02-05ssl: Use specs to generate type documentationIngela Anderton Andin
2019-02-05Merge branch 'lukas/erts/cerl-etp-rr-support' into maintLukas Larsson
* lukas/erts/cerl-etp-rr-support: erts: Expand rr support in cerl and etp
2019-02-05erts: Expand rr support in cerl and etpLukas Larsson
2019-02-04Fix bug in ei_accept_tmoRickard Green
2019-02-04Merge branch 'maint-21' into maintPéter Dimitrov
* maint-21: Updated OTP version Prepare release
2019-02-04Merge branch 'peterdmv/inets/fix-http-client/ERIERL-289/OTP-15554' into maintPéter Dimitrov
* peterdmv/inets/fix-http-client/ERIERL-289/OTP-15554: inets: Ignore bracket option in format_address Change-Id: If3f19325edb8f8cc1ced717aa125658c00438b70
2019-02-04ssl: Enhance error handlingIngela Anderton Andin
2019-02-04Merge pull request #2128 from amatalai/fix-typo-in-erlang-xmlLukas Larsson
Fix typo in erlang.xml
2019-02-04Fix typo in erlang.xmlTobiasz
2019-02-01ssl: Remove unintended matchIngela Anderton Andin
2019-02-01Updated OTP versionOTP-21.2.5Erlang/OTP
2019-02-01Prepare releaseErlang/OTP
2019-02-01Merge branch 'peterdmv/inets/fix-http-client/ERIERL-289/OTP-15554' into maint-21Erlang/OTP
* peterdmv/inets/fix-http-client/ERIERL-289/OTP-15554: inets: Ignore bracket option in format_address
2019-02-01Merge pull request #2117 from essen/fix-erl_epmd_port_please-spec/OTP-15557Lukas Larsson
Fix spec for erl_epmd:port_please
2019-02-01Merge branch 'lukas/erts/fix_system_info_kernelpoll/OTP-15556' into maintLukas Larsson
* lukas/erts/fix_system_info_kernelpoll/OTP-15556: erts: Fix erlang:system_info(kernel_poll) to return correct value
2019-02-01erts: Fix erlang:system_info(kernel_poll) to return correct valueLukas Larsson
2019-02-01fix: erts: Remove dead ERTS_MAGIC_REF_BIF_TIMERS codeLukas Larsson
2019-02-01Merge branch 'lukas/OTP-21.3-cleanup' into maintLukas Larsson
* lukas/OTP-21.3-cleanup: erl_interface: Fix bsd makefile problem erts: Remove dead ERTS_MAGIC_REF_BIF_TIMERS code