aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-12-28Merge branch 'maint'Hans Nilsson
* maint: Updated OTP version Prepare release ssh: Fix port leakage for daemons failing at start ssh: Add port close test
2018-12-28Merge branch 'maint-21' into maintHans Nilsson
* maint-21: Updated OTP version Prepare release ssh: Fix port leakage for daemons failing at start ssh: Add port close test
2018-12-27Updated OTP versionOTP-21.2.2Erlang/OTP
2018-12-27Prepare releaseErlang/OTP
2018-12-27Merge branch 'hans/ssh/port_leak/OTP-15397' into maint-21Erlang/OTP
* hans/ssh/port_leak/OTP-15397: ssh: Fix port leakage for daemons failing at start ssh: Add port close test # Conflicts: # lib/ssh/test/ssh_basic_SUITE.erl
2018-12-21ssh: Fix port leakage for daemons failing at startHans Nilsson
2018-12-21ssh: Add port close testHans Nilsson
2018-12-21Merge branch 'maint'Lukas Larsson
2018-12-21Merge branch 'lukas/erts/inet_pktopts_old_linux/OTP-15494' into maintLukas Larsson
* lukas/erts/inet_pktopts_old_linux/OTP-15494: erts: Fix inet pktopts on very old linux kernels
2018-12-21Merge branch 'maint'Ingela Anderton Andin
* maint: Updated OTP version Prepare release
2018-12-21Merge branch 'maint-21' into maintIngela Anderton Andin
* maint-21: Updated OTP version Prepare release
2018-12-20Merge branch 'maint'Ingela Anderton Andin
2018-12-20Updated OTP versionOTP-21.2.1Erlang/OTP
2018-12-20Prepare releaseErlang/OTP
2018-12-20Merge branch 'ingela/ssl/patch-maint-21/ERL-308/OTP-15489' into maint-21Erlang/OTP
* ingela/ssl/patch-maint-21/ERL-308/OTP-15489: ssl: Fix renegotiation with new TLS sender ssl: Add renegotiate test case ssl: Remove no longer needed functions ssl: Fix downgrade ssl: Remove checks and conversions not needed ssl: Use binary:copy/2 to avoid list overhead ssl: Remove unnecessary internal event ssl: Clean code ssl: Add static_env record
2018-12-20Merge branch 'sverker/big-band-bug/ERL-804/OTP-15487' into maint-21Erlang/OTP
* sverker/big-band-bug/ERL-804/OTP-15487: erts: Fix bug in 'band' of two negative numbers, one big
2018-12-20Merge branch 'sverker/fix-atomics-get-large-unsigned/PR-2061/OTP-15486' into ↵Erlang/OTP
maint-21 * sverker/fix-atomics-get-large-unsigned/PR-2061/OTP-15486: erts: Fix possible heap corruption getting atomics
2018-12-20Merge branch 'sverker/erts/prim_file-perm-own-bigendian/OTP-15485' into maint-21Erlang/OTP
* sverker/erts/prim_file-perm-own-bigendian/OTP-15485: erts: Fix warning and potential big-endian-bug in prim_file
2018-12-20Merge pull request #2064 from kjnilsson/observer/expand_term_fixSiri Hansen
Observer: fix crash bug when expanding term OTP-15493
2018-12-20Merge branch 'ingela/ssl/patch-maint-21/ERL-308/OTP-15489' into maintIngela Anderton Andin
2018-12-20ssl: Fix renegotiation with new TLS senderIngela Anderton Andin
Wtite connection state was not synchronized when peer initiated renegotiation
2018-12-20ssl: Add renegotiate test caseIngela Anderton Andin
2018-12-20ssl: Remove no longer needed functionsIngela Anderton Andin
As the stop wrapper functions are no longer needed after tls_sender that altered the behaviour of the TLS distribution code.
2018-12-20ssl: Fix downgradeIngela Anderton Andin
Both test case and code needed updates to work as intended. Code needed update due to new tls_sender process and the test case gave false positive reusult erarlier probably due to beeing to sloopy in order to avoid timeouts.
2018-12-20ssl: Remove checks and conversions not neededIngela Anderton Andin
2018-12-20ssl: Use binary:copy/2 to avoid list overheadIngela Anderton Andin
2018-12-20ssl: Remove unnecessary internal eventIngela Anderton Andin
2018-12-20ssl: Clean codeIngela Anderton Andin
Rename Connection:handle_common_event Connection:handle_protocol_record removing use of unnecessary argument and making code easier to understand.
2018-12-20ssl: Add static_env recordIngela Anderton Andin
State values created at init
2018-12-20Merge branch 'ingela/ssl/master/hs-correction'Ingela Anderton Andin
* ingela/ssl/master/hs-correction: ssl: Correct number of arguments in master
2018-12-20ssl: Correct number of arguments in masterIngela Anderton Andin
2018-12-20Merge branch 'maint'Lukas Larsson
Conflicts: erts/preloaded/ebin/atomics.beam erts/preloaded/ebin/counters.beam erts/preloaded/ebin/erl_prim_loader.beam erts/preloaded/ebin/erl_tracer.beam erts/preloaded/ebin/erlang.beam erts/preloaded/ebin/erts_code_purger.beam erts/preloaded/ebin/erts_dirty_process_signal_handler.beam erts/preloaded/ebin/erts_internal.beam erts/preloaded/ebin/erts_literal_area_collector.beam erts/preloaded/ebin/init.beam erts/preloaded/ebin/otp_ring0.beam erts/preloaded/ebin/persistent_term.beam erts/preloaded/ebin/prim_buffer.beam erts/preloaded/ebin/prim_eval.beam erts/preloaded/ebin/prim_file.beam erts/preloaded/ebin/prim_inet.beam erts/preloaded/ebin/prim_zip.beam erts/preloaded/ebin/zlib.beam
2018-12-20Update preloaded modulesLukas Larsson
2018-12-20Merge branch 'lukas/erts/fix-seq_trace-reset_trace/OTP-15490' into maintLukas Larsson
* lukas/erts/fix-seq_trace-reset_trace/OTP-15490: erts: Fix seq_trace:reset_trace dirty gc bug erts: Use sys_memcpy in copy_one_frag
2018-12-20Merge branch 'maint'Ingela Anderton Andin
Conflicts: lib/ssl/src/tls_connection.erl
2018-12-20Merge branch 'ingela/ssl/renegotiate-with-new-tls-sender/ERL-803/OTP-15489' ↵Ingela Anderton Andin
into maint * ingela/ssl/renegotiate-with-new-tls-sender/ERL-803/OTP-15489: ssl: Fix renegotiation with new TLS sender ssl: Add renegotiate test case
2018-12-19Merge branch 'maint'Sverker Eriksson
* maint: Updated OTP version Prepare release
2018-12-19Merge tag 'OTP-20.2.0.1' into maintSverker Eriksson
=== OTP-20.2.0.1 === Changed Applications: - erts-9.2.0.1 Unchanged Applications: - asn1-5.0.4 - common_test-1.15.3 - compiler-7.1.4 - cosEvent-2.2.2 - cosEventDomain-1.2.2 - cosFileTransfer-1.2.2 - cosNotification-1.2.3 - cosProperty-1.2.3 - cosTime-1.2.3 - cosTransactions-1.3.3 - crypto-4.2 - debugger-4.2.4 - dialyzer-3.2.3 - diameter-2.1.3 - edoc-0.9.2 - eldap-1.2.3 - erl_docgen-0.7.2 - erl_interface-3.10.1 - et-1.6.1 - eunit-2.3.5 - hipe-3.17 - ic-4.4.3 - inets-6.4.5 - jinterface-1.8.1 - kernel-5.4.1 - megaco-3.18.3 - mnesia-4.15.2 - observer-2.6 - odbc-2.12.1 - orber-3.8.4 - os_mon-2.4.4 - otp_mibs-1.1.2 - parsetools-2.1.6 - public_key-1.5.2 - reltool-0.7.5 - runtime_tools-1.12.3 - sasl-3.1.1 - snmp-5.2.9 - ssh-4.6.3 - ssl-8.2.3 - stdlib-3.4.3 - syntax_tools-2.1.4 - tools-2.11.1 - wx-1.8.3 - xmerl-1.3.16 * tag 'OTP-20.2.0.1': Updated OTP version Prepare release
2018-12-19Updated OTP versionOTP-20.2.0.1Sverker Eriksson
2018-12-19Prepare releaseSverker Eriksson
2018-12-19Merge branch 'maint'Sverker Eriksson
2018-12-19Merge branch 'sverker/erl_child_setup/ERIERL-231/OTP-15488' into maintSverker Eriksson
DUMMY MERGE
2018-12-19ssl: Fix renegotiation with new TLS senderIngela Anderton Andin
Wtite connection state was not synchronized when peer initiated renegotiation
2018-12-19ssl: Add renegotiate test caseIngela Anderton Andin
2018-12-19Merge branch 'maint'Ingela Anderton Andin
2018-12-19Merge branch 'ingela/ssl/test-cuddle' into maintIngela Anderton Andin
* ingela/ssl/test-cuddle: ssl: Cuddle test cases
2018-12-19ssl: Cuddle test casesIngela Anderton Andin
Cipher test case also needed updating to handle streams correctly We should not rizzo test chacha20_poly1305 Conflicts: lib/ssl/test/ssl_basic_SUITE.erl
2018-12-19Observer: fix crash bug when expanding termkjnilsson
Observer makes use of cdv_html_wx but does not start cdv_wx first which made it crash when trying to send a message to cdv_wx. This fix avoids updating the status when the application using cdv_html_wx is cdv.
2018-12-18Merge branch 'sverker/erl_child_setup/ERIERL-231/OTP-15488'Sverker Eriksson
* sverker/erl_child_setup/ERIERL-231/OTP-15488: Add assertions to forker and erl_child_setup
2018-12-18Merge branch 'maint'Sverker Eriksson