aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-10-09Change {clean_timeout,infinity} to use proxyRaimo Niskanen
2017-10-03Merge branch 'maint'Hans Nilsson
* maint: Updated OTP version Prepare release Fix zlib merge snafu ssh: fix broken printouts ssh: exclude aes_gcm if peer is OpenSSH 6.2 (known bug) Conflicts: OTP_VERSION
2017-10-03Merge branch 'maint-20' into maintHans Nilsson
* maint-20: Updated OTP version Prepare release Fix zlib merge snafu ssh: fix broken printouts ssh: exclude aes_gcm if peer is OpenSSH 6.2 (known bug)
2017-10-02Merge branch 'maint'Sverker Eriksson
2017-10-02Merge branch 'sverker/bad-dist-msg-bug/ERIERL-80/OTP-14661' into maintSverker Eriksson
2017-10-02erts: Fix bug when detecting bad dist messageSverker Eriksson
We can't just leave it in queue with dist_ext=NULL. Two symptoms seen: 1. 'receive' trying to deref dist_ext as NULL. 2. GC think it's a term and put THE_NON_VALUE in root set.
2017-10-02Add distribution_SUITE:bad_dist_ext_sizeSverker Eriksson
2017-10-02Updated OTP versionOTP-20.1.1Erlang/OTP
2017-10-02Prepare releaseErlang/OTP
2017-10-02Merge branch 'john/erts/fix-zlib-merge/OTP-14648/OTP-14649' into maint-20Erlang/OTP
* john/erts/fix-zlib-merge/OTP-14648/OTP-14649: Fix zlib merge snafu
2017-10-02Merge branch 'hans/ssh/printout_crash/OTP-14645' into maint-20Erlang/OTP
* hans/ssh/printout_crash/OTP-14645: ssh: fix broken printouts
2017-10-02Merge branch 'bjorn/erts/match-context/ERL-490/OTP-14640' into maint-20Erlang/OTP
* bjorn/erts/match-context/ERL-490/OTP-14640: Fix incorrect internal consistency failure for binary matching code
2017-10-02Merge branch 'hans/ssh/adjust_for_peers_version/OTP-14638' into maint-20Erlang/OTP
* hans/ssh/adjust_for_peers_version/OTP-14638: ssh: exclude aes_gcm if peer is OpenSSH 6.2 (known bug)
2017-10-02Fix zlib merge snafuJohn Högberg
I accidentally merged a few fixes directly to maint-20 (and then to maint and master), instead of merging to maint and master and waiting for a patch to merge it into maint-20, leaving the related tickets dangling. This commit does nothing beyond getting the tickets (and their release notes) into the next patch.
2017-10-02Merge branch 'maint'Hans Nilsson
2017-10-02Merge branch 'hans/ssh/ecdsa_pass_phrase/OTP-14602' into maintHans Nilsson
2017-10-02ssh: add ecdsa_pass_phrase option in analogy with rsa_pass_phraseHans Nilsson
2017-10-02Merge branch 'maint'John Högberg
2017-10-02Update primary bootstrapBjörn Gustavsson
2017-10-02Merge branch 'maint-20' into maintJohn Högberg
2017-10-02Merge branch 'maint'Hans Nilsson
2017-10-02Merge pull request #1546 from michalmuskala/bs-add-optBjörn Gustavsson
Optimise size calculation for binary construction OTP-14654
2017-10-02Merge branch 'hans/public_key/verify_hostname_ip_address/OTP-14653' into maintHans Nilsson
2017-10-02public_key: verify ip (both v4 and v6)Hans Nilsson
2017-10-02public_key: Added IP4 address checks to hostname_verification testsHans Nilsson
2017-10-02Merge branch 'bjorn/erts/improve-beam-ops'Björn Gustavsson
* bjorn/erts/improve-beam-ops: Move out variables from the head of combined instructions Change operand from 'P' to 'Q' for i_apply_last and i_apply_fun_last Add CHECK_ALIGNED() for testing storage destinations instrs.tab: Add missing -no_next directives beam_load.c: Generalize the 'P' operator in the packing engine Break out most of the initialization from process_main() Eliminate the OpCode() macro Eliminate unnecessary and inconsistent casts Refactor macros for accessing Beam instructions beam_emu: Make order of macros consistent beam_SUITE: Strengthen test of packed registers
2017-10-02Merge pull request #1589 from bjorng/bjorn/erts/instruction-offsetsBjörn Gustavsson
Point out the correct line number in stack traces
2017-10-02Merge branch 'maint'Ingela Anderton Andin
2017-10-02Merge branch 'ingela/inets-typo/ERL-492' into maintIngela Anderton Andin
* ingela/inets-typo/ERL-492: inets: Fix documentation typo
2017-10-02inets: Fix documentation typoIngela Anderton Andin
2017-10-02Merge branch 'maint'Ingela Anderton Andin
2017-10-02Merge branch 'ingela/dtls/renegotiate/OTP-14563' into maintIngela Anderton Andin
* ingela/dtls/renegotiate/OTP-14563: dtls: Compleate DTLS renegotiate implementation
2017-10-02Merge branch 'maint'Rickard Green
* maint: Don't allow null in filenames
2017-10-02Merge branch 'rickard/null-char-filenames/ERL-370/OTP-14543' into maintRickard Green
* rickard/null-char-filenames/ERL-370/OTP-14543: Don't allow null in filenames
2017-10-02Merge branch 'lukas/erts/poll-thread/OTP-14346'Lukas Larsson
* lukas/erts/poll-thread/OTP-14346: (25 commits) erts: Trigger ready events when erts_io_control fails erts: enif_select steal test kernel: Rewrite gen_udp_SUITE:read_packet tc erts: disable kernel-poll on OS X vsn < 16 erts: Fix msacc testcase with new poll-thread erts: Add testcases to test IOp and IOt options erts: get_internal_state(check_io_debug) now prints to error_logger erts: Remove eager check io erts: Move all I/O polling to a seperate thread erts: Fix smp_select testcase to use ERL_DRV_USE erts: Fix msacc unmanaged state counter erts: Optimize port_task quick allocator erts: Add ERTS_THR_PREF_QUICK_ALLOC_IMPL erts: Update suspend of scheduler to handle multiple pollsets erts: Add multiple poll sets erts: Some code cleanup for gdb to work better erts: temp_alloc can no longer be disabled erts: Refactor check_io to use one static struct erts: Replace check_io spinlock with lock-less list insertion erts: Add number of enif_select's to check_io_debug ...
2017-10-02erts: Trigger ready events when erts_io_control failsLukas Larsson
2017-10-02erts: enif_select steal testDmytro Lytovchenko
2017-10-02kernel: Rewrite gen_udp_SUITE:read_packet tcLukas Larsson
The old testcase did not test anything at all, it seems like it was written with the non-smp emulator inmind.
2017-10-02erts: disable kernel-poll on OS X vsn < 16Lukas Larsson
kqueue is broken on earlier versions of OS X.
2017-10-02erts: Fix msacc testcase with new poll-threadLukas Larsson
2017-10-02erts: Add testcases to test IOp and IOt optionsLukas Larsson
2017-10-02erts: get_internal_state(check_io_debug) now prints to error_loggerLukas Larsson
2017-10-02erts: Remove eager check ioLukas Larsson
It is not longer relevant when using the poll thread
2017-10-02erts: Move all I/O polling to a seperate threadLukas Larsson
2017-10-02erts: Fix smp_select testcase to use ERL_DRV_USELukas Larsson
This is needed with the new poll-thread implementation as now closed fd's in the pollset will be triggered much faster than before.
2017-10-02erts: Fix msacc unmanaged state counterLukas Larsson
OTP-14652
2017-10-02erts: Optimize port_task quick allocatorSverker Eriksson
for non scheduler threads by using ERTS_THR_PREF_QUICK_ALLOC_IMPL.
2017-10-02erts: Add ERTS_THR_PREF_QUICK_ALLOC_IMPLSverker Eriksson
usable from any (managed?) thread.
2017-10-02erts: Update suspend of scheduler to handle multiple pollsetsRickard Green
2017-10-02erts: Add multiple poll setsSverker Eriksson