aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-10-22Merge branch 'maint'Rickard Green
* maint: Update version info for internal patch merge scripts
2018-10-22Update version info for internal patch merge scriptsRickard Green
2018-10-22Merge branch 'maint'Raimo Niskanen
Conflicts: erts/preloaded/ebin/prim_inet.beam
2018-10-22Merge branch 'raimo/tcp-close-while-send/maint/ERL-561/OTP-12242' into maintRaimo Niskanen
* raimo/tcp-close-while-send/maint/ERL-561/OTP-12242: Write test case Fix hanging gen_tcp send vs close race Conflicts: erts/preloaded/ebin/prim_inet.beam
2018-10-22Merge branch 'maint'Ingela Anderton Andin
2018-10-22Merge branch 'ingela/ssl/aead-refactor' into maintIngela Anderton Andin
* ingela/ssl/aead-refactor: ssl: Refactor AEAD ciphers
2018-10-21Merge branch 'maint'Rickard Green
* maint: Add version info for internal patch merge scripts
2018-10-21Add version info for internal patch merge scriptsRickard Green
2018-10-19ssl: Refactor AEAD ciphersIngela Anderton Andin
TLS-1.3 needs to handle AEAD inputs diffrently than previous versions. Refactor code to facilitate TLS-1.3 additions. Change CHACHA20_POLY1305 NONCE to match RFC 7905. This will be important later when we fix interop with TLS compatible crypto invocation.
2018-10-19Write test caseRaimo Niskanen
2018-10-19Fix hanging gen_tcp send vs close raceRaimo Niskanen
While a gen_tcp send was in progress with filled buffers and slow receiver a close (from another process) would place the port in a half dead state so the port could not signal back to send, that waited for confirmation. The solution is to after some time (5 s) of waiting for send confirmation set a monitor on the port, which detects if the port becomes half dead due to close from another process. The close pending loop has also been improved to use the linger timeout for waiting, and to set a system timeout (arbitrarily selected 3 min) to not wait forever when the other end reads data s l o w l y (tarpitting, kind of).
2018-10-19Merge branch 'maint'Hans Nilsson
* maint: Updated OTP version Prepare release
2018-10-19Merge branch 'maint-19' into maintHans Nilsson
* maint-19: Updated OTP version Prepare release
2018-10-19Merge branch 'maint'Siri Hansen
2018-10-19Merge pull request #1975 from sirihansen/siri/logger/config-set-or-updateSiri Hansen
Forward set/update indicator to handler callback changing_config OTP-15364
2018-10-19Merge branch 'maint'Siri Hansen
2018-10-19Merge branch 'siri/cuddle' into maintSiri Hansen
* siri/cuddle: Fix gen_fsm_SUITE:start2/1 to terminate process synchronously Fix sys_SUITE:special_process/1 to terminating process synchronously
2018-10-19 Merge branch 'john/compiler/list_to_integer_2-is-pure'John Högberg
* john/compiler/list_to_integer_2-is-pure: compiler: list_to_integer/2 is pure
2018-10-18Updated OTP versionOTP-19.3.6.12Erlang/OTP
2018-10-18Prepare releaseErlang/OTP
2018-10-18Merge branch 'hans/eldap/prevent_EXIT_at_close/OTP-15342/ERIERL-242' into ↵Erlang/OTP
maint-19 * hans/eldap/prevent_EXIT_at_close/OTP-15342/ERIERL-242: eldap: Fix race at socket close
2018-10-18Merge branch 'maint'Hans Nilsson
* maint: Updated OTP version Prepare release
2018-10-18Merge branch 'maint-20' into maintHans Nilsson
* maint-20: Updated OTP version Prepare release
2018-10-18compiler: list_to_integer/2 is pureJohn Högberg
2018-10-18Merge pull request #1978 from richcarl/ensure-nonempty-snameJohn Högberg
Do not allow an empty string as node name
2018-10-17Merge branch 'maint'Sverker Eriksson
2018-10-17Merge branch 'sverker/erts/debug_free_null' into maintSverker Eriksson
* sverker/erts/debug_free_null: erts: Fix bug in debug_free for NULL pointer
2018-10-17Merge pull request #1988 from erlang/lukas/kernel/docs-assertLukas Larsson
kernel: Fix spelling error in assert.hrl
2018-10-17kernel: Fix spelling error in assert.hrlLukas Larsson
2018-10-17Merge branch 'john/erts/update-zlib/OTP-15351/ERL-749'John Högberg
* john/erts/update-zlib/OTP-15351/ERL-749: Update zlib to 1.2.11 Allow undefined macros when building zlib
2018-10-17Merge branch 'maint'John Högberg
* maint: "cork" tcp socket around file:sendfile Add nopush TCP socket option
2018-10-17Merge branch 'igor/tcp-nopush-ERL-698/OTP-15357' into maintJohn Högberg
* igor/tcp-nopush-ERL-698/OTP-15357: "cork" tcp socket around file:sendfile Add nopush TCP socket option
2018-10-16Merge branch 'maint'Sverker Eriksson
2018-10-16Merge branch 'sverker/erts/18/memory-leak-terminating-port/OTP-14609' into maintSverker Eriksson
* sverker/erts/18/memory-leak-terminating-port/OTP-14609: erts: Fix memory leak when sending to terminating port
2018-10-16Updated OTP versionOTP-20.3.8.10Erlang/OTP
2018-10-16Prepare releaseErlang/OTP
2018-10-16Merge branch 'sverker/erts/ets-select_replace-bug/OTP-15346' into maint-20Erlang/OTP
* sverker/erts/ets-select_replace-bug/OTP-15346: erts: Fix bug in ets:select_replace for bound key
2018-10-16Merge branch 'hans/eldap/prevent_EXIT_at_close/OTP-15342/ERIERL-242' into ↵Erlang/OTP
maint-20 * hans/eldap/prevent_EXIT_at_close/OTP-15342/ERIERL-242: eldap: Fix race at socket close
2018-10-16Fix gen_fsm_SUITE:start2/1 to terminate process synchronouslySiri Hansen
2018-10-16Fix sys_SUITE:special_process/1 to terminating process synchronouslySiri Hansen
2018-10-16Merge branch 'fhunleth/fix-muslc-compiler-error' into ↵John Högberg
john/erts/update-zlib/OTP-15351/ERL-749 * fhunleth/fix-muslc-compiler-error: Allow undefined macros when building zlib
2018-10-16Update zlib to 1.2.11John Högberg
2018-10-16Merge pull request #1970 from peterdmv/ssl/signature_algorithms/OTP-15248Péter Dimitrov
Implement Signature Algorithms (TLS 1.3)
2018-10-16Merge branch 'maint'John Högberg
* maint: beam_utils: Handle bs_start_match2 in anno_defs
2018-10-16Merge branch 'john/compiler/bs_match-anno-liveness-fix/OTP-15353/ERL-753' ↵John Högberg
into maint * john/compiler/bs_match-anno-liveness-fix/OTP-15353/ERL-753: beam_utils: Handle bs_start_match2 in anno_defs
2018-10-15erts: Fix bug in debug_free for NULL pointerSverker Eriksson
causing ASSERT in sys_memset to fail.
2018-10-15beam_utils: Handle bs_start_match2 in anno_defsJohn Högberg
2018-10-15ssl: Update default for option signature_algs_certPéter Dimitrov
The option 'signature_algs_cert' is not set by default. Change-Id: Ib87cedc5e48b3ac7a36a30bc7caa08d3193f12fa
2018-10-15eldap: Update default hash algorithm in FTPéter Dimitrov
Update default hash algorithm (md5 -> sha1) used for generating the server and CA certificates. Default support for md5 has been removed for TLS 1.2 and OTP-15248 introduced a check for the whole {hash, signature} algorithm pair as defined by RFC5246. Change-Id: I964914914f522c10ef11c8c7c72bb9e4a0c38010
2018-10-15ssl: Test hash/signature algorithm selectionPéter Dimitrov
Change-Id: Ie60b2a2651ea975cebd0ccf0c7e2953f89986463
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 13:25:21 +0000