aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2019-08-22Merge branch 'ingela/ssl/test-cuddle' into maintIngela Anderton Andin
* ingela/ssl/test-cuddle: ssl: Make sure test starts in a "good" state ssl: Cuddle timeout
2019-08-22ssl: Make sure test starts in a "good" stateIngela Anderton Andin
2019-08-22ssl: Cuddle timeoutIngela Anderton Andin
2019-08-21Merge pull request #2352 from distortedsignal/patch-2Lukas Larsson
Add helping verb
2019-08-21Merge branch 'ingela/ssl/test-cuddle' into maintIngela Anderton Andin
* ingela/ssl/test-cuddle: public_key: Use another time in test certificates ssl: Robustify test case
2019-08-21public_key: Use another time in test certificatesIngela Anderton Andin
Some OpenSSL versions has problems handling the current selected time causing interop tests to fail.
2019-08-21ssl: Robustify test caseIngela Anderton Andin
2019-08-21Merge branch 'hasse/eunit/io_protocol_fix/OTP-16000' into maintHans Bolinder
* hasse/eunit/io_protocol_fix/OTP-16000: eunit: Handle get_until requests with explicit encoding
2019-08-20eunit: Handle get_until requests with explicit encodingHans Bolinder
2019-08-20Merge branch 'kpy3/fix-fd-leak-in-logger/OTP-15997' into maintLukas Larsson
* kpy3/fix-fd-leak-in-logger/OTP-15997: Close log files in case of inode change properly
2019-08-20Merge branch 'legoscia/stdlib/fun2ms-plusplus/OTP-15992/PR-2322' into maintHans Bolinder
* legoscia/stdlib/fun2ms-plusplus/OTP-15992/PR-2322: fun2ms: accept ++ in function head when called from shell
2019-08-19Add helping verbTom Kelley
Needed a helping verb, added a helping verb.
2019-08-19Merge branch 'sverker/erl_interface/ei_decode_fun-fix/OTP-15996' into maintSverker Eriksson
* sverker/erl_interface/ei_decode_fun-fix/OTP-15996: erl_interface: Fix bug in ei_decode_fun for very old encoding
2019-08-19Merge branch 'ingela/ssl/test-cuddle' into maintIngela Anderton Andin
* ingela/ssl/test-cuddle: ssl: Add OpenSSL renegotiate sanity check ssl: Fix missing OpenSSL conf
2019-08-19ssl: Add OpenSSL renegotiate sanity checkIngela Anderton Andin
2019-08-19ssl: Fix missing OpenSSL confIngela Anderton Andin
2019-08-19Merge branch 'hans/ssh/gendoc/OTP-15395' into maintHans Nilsson
* hans/ssh/gendoc/OTP-15395: ssh: Use new ssh_connection:event() type in channel defs ssh: change type names ssh: The ssh_connection documentation is now generated ssh: Update ssh_sftp:start_channel documentation and code ssh: The ssh_sftp documentation is now generated ssh: The ssh_sftpd documentation is now generated
2019-08-19Merge branch 'hans/ssh/remove_unused_rec_fields/OTP-15984' into maintHans Nilsson
* hans/ssh/remove_unused_rec_fields/OTP-15984: ssh: Remove unused address,port from #connection{} ssh: Remove unused port_bindings from #connection{}
2019-08-19Merge branch 'hans/ssh/early_crash_fail_logging/ERL-990/OTP-15962' into maintHans Nilsson
* hans/ssh/early_crash_fail_logging/ERL-990/OTP-15962: ssh: Don't assume Reason to be a string()
2019-08-19Merge branch 'hasse/kernel/global_tests' into maintHans Bolinder
* hasse/kernel/global_tests: kernel: Correct a test case in global_SUITE
2019-08-16ssh: Don't assume Reason to be a string()Hans Nilsson
2019-08-16Merge pull request #2349 from ↵Björn Gustavsson
bjorng/bjorn/compiler/fix-beam_except/ERL-1026/OTP-15985 Fix an internal consistency check failure caused by beam_except
2019-08-16Merge branch 'john/erts/process_info-binary-heap-fragments/OTP-15978' into maintJohn Högberg
* john/erts/process_info-binary-heap-fragments/OTP-15978: erts: Scan heap fragments for off-heap binaries
2019-08-15Fix an internal consistency check failure caused by beam_exceptBjörn Gustavsson
https://bugs.erlang.org/browse/ERL-1026
2019-08-14Merge pull request #2347 from ↵Björn Gustavsson
bjorng/bjorn/compiler/fix-receive-bug/ERL-1022/OTP-15982 Fix compiler crash when compiling some receive statements
2019-08-14ssh: Remove unused address,port from #connection{}Hans Nilsson
2019-08-14ssh: Remove unused port_bindings from #connection{}Hans Nilsson
2019-08-14Fix compiler crash when compiling some receive statementsBjörn Gustavsson
The compiler would crash when compiling the following code: do(Acc) -> receive {Pid, abc} -> ok; {Pid, []} -> ok; {Pid, _Res} -> exit(_Res) end, do([Pid | Acc]). The last clause that always raises an exception would confuse the compiler so that it would think that the `receive` statement was at the end of the function and it would generate incorrect code for the `do/1` call following the `receive`. https://bugs.erlang.org/browse/ERL-1022
2019-08-13erl_interface: Fix bug in ei_decode_fun for very old encodingSverker Eriksson
Found by valgrind test runs.
2019-08-13Merge branch 'john/erts/fix-instrument-allocations-race/OTP-15983' into maintJohn Högberg
* john/erts/fix-instrument-allocations-race/OTP-15983: erts: Fix crash in instrument:allocations/0-1
2019-08-12ssh: Use new ssh_connection:event() type in channel defsHans Nilsson
2019-08-12ssh: change type namesHans Nilsson
2019-08-12ssh: The ssh_connection documentation is now generatedHans Nilsson
2019-08-12ssh: Update ssh_sftp:start_channel documentation and codeHans Nilsson
The Typing in the old documentation was not up-to-date. The option handling and definition is slightly re-worked in the code also. Some comments added and a function moved inside the module.
2019-08-12ssh: The ssh_sftp documentation is now generatedHans Nilsson
2019-08-12ssh: The ssh_sftpd documentation is now generatedHans Nilsson
2019-08-12Merge branch 'john/erts/bs_get_binary2-heap-binaries/OTP-15977' into maintJohn Högberg
* john/erts/bs_get_binary2-heap-binaries/OTP-15977: erts: Create heap binaries in binary:split/2-3 erts: Create heap binaries in binary_part/2-3 erts: Create heap binaries in split_binary/2 erts: Create heap binaries in bs_get_binary2 erts: Remove size check in bs_start_match erts: Disallow binaries whose size in bits exceeds UWORD_MAX
2019-08-12erts: Fix crash in instrument:allocations/0-1John Högberg
The current carrier list was read when the allocator wasn't locked, crashing the emulator if a block scan raced with a carrier allocation.
2019-08-12Merge pull request #2325 from max-au/is_map_key_doc_fixBjörn Gustavsson
Fix documentation for erlang:is_map_key/2
2019-08-12erts: Scan heap fragments for off-heap binariesJohn Högberg
2019-08-09Merge pull request #2332 from the-mikedavis/patch-1Dan Gudmundsson
Correct documentation on dump_log_write_threshold default value
2019-08-09Merge remote-tracking branch 'upstream/pr/2201' into maintDan Gudmundsson
* upstream/pr/2201: Handle clicking links more than once in Observer's "Expanded term" OTP-15980
2019-08-09erts: Create heap binaries in binary:split/2-3John Högberg
2019-08-09erts: Create heap binaries in binary_part/2-3John Högberg
2019-08-09erts: Create heap binaries in split_binary/2John Högberg
2019-08-09erts: Create heap binaries in bs_get_binary2John Högberg
ErlSubBin is a large struct that often dwarfs the region of memory it points at, and it's common for them to refer to a ProcBin which must be kept around as long as the SubBin lives, using up even more heap space and keeping the referenced binary alive regardless of how small the sub-binary is.
2019-08-09erts: Remove size check in bs_start_matchJohn Högberg
The size check is redundant now that all binaries are guaranteed to be small enough that their size in bits fits into a word.
2019-08-09erts: Disallow binaries whose size in bits exceeds UWORD_MAXJohn Högberg
These have never worked in binary matching (including sub-binaries extracted from them) so it's hard to justify their existence. They also make a future migration of binary sizes from bytes to bits problematic, so we may as well change it ahead of time. This is potentially incompatible on 32-bit platforms where a NIF or driver could allocate 512MB+ binaries, but allocations that large should be expected to fail anyway.
2019-08-09Merge branch 'dgud/observer/fix-darkmode/OTP-15916' into maintDan Gudmundsson
* dgud/observer/fix-darkmode/OTP-15916: observer: Fixes for html viewers observer: Support darkmode gui
2019-08-09Merge branch 'dgud/mnesia/sticky-bug/ERL-768/OTP-15979' into maintDan Gudmundsson
* dgud/mnesia/sticky-bug/ERL-768/OTP-15979: mnesia: Bump protocol version mnesia: Introduce sync_asym_trans protocol