aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-07-03Merge pull request #1491 from eltex-ecss/e2k_supportLukas Larsson
Support e2k platform OTP-14492
2017-07-03Update sasl/test/test_lib.hrl with recent versions of kernel and stdlibSiri Hansen
"Old" versions are now taken from OTP-20.0, i.e. one major revision back from OTP-21.
2017-07-03Merge branch 'maint'Ingela Anderton Andin
2017-07-03Merge branch 'ingela/cuddle-openssl' into maintIngela Anderton Andin
* ingela/cuddle-openssl: ssl: Workaround localhost problems ssl: Move clause so that it will match
2017-07-02escript.c: remove dead codeMikael Pettersson
2017-06-30erts: Increase pre-allocated blocks #ifdef DEBUGSverker Eriksson
Choose a "lagom" low value to provoke both fallback on erts_alloc AND thread racing in lockless deallocation queue.
2017-06-30ssl: Workaround localhost problemsIngela Anderton Andin
If net_adm:localhost() returns a FQDN we want to use it otherwise we want to use localhost.
2017-06-30Updated OTP versionOTP-20.0.1Erlang/OTP
2017-06-30Update release notesErlang/OTP
2017-06-30Update version numbersErlang/OTP
2017-06-30Merge branch 'sverker/prealloc-race-bug/OTP-14491' into maint-20Erlang/OTP
* sverker/prealloc-race-bug/OTP-14491: erts: Fix bug in quick alloc
2017-06-30Merge branch 'siri/dbg/faulty-encoding-comment/OTP-14479' into maint-20Erlang/OTP
* siri/dbg/faulty-encoding-comment/OTP-14479: [dbg] Fix encoding comment
2017-06-30Merge branch 'siri/make/default-outdir/ERL-438/OTP-14489' into maint-20Erlang/OTP
* siri/make/default-outdir/ERL-438/OTP-14489: [ct_make] Do not use the interactive tool 'c' from ct_make Use current dir as default outdir for c:c/1,2 [make] Do not use the interactive tool 'c' from make
2017-06-30Merge branch 'dgud/stdlib/string-len-compat/OTP-14487' into maint-20Erlang/OTP
* dgud/stdlib/string-len-compat/OTP-14487: Fix old length usage in string
2017-06-30Merge branch 'rickard/statistics/OTP-14484' into maint-20Erlang/OTP
* rickard/statistics/OTP-14484: Fix statistics(wall_clock) and statistics(runtime) implementation
2017-06-30Merge branch 'hasse/stdlib/fix_proc_lib/PR-1488/OTP-14482' into maint-20Erlang/OTP
* hasse/stdlib/fix_proc_lib/PR-1488/OTP-14482: stdlib: Fix bug in proc_lib Support arbitrary crash report in proc_lib.
2017-06-30Merge branch 'lukas/erts/fix_outputv_port_task_cleanup/ERL-428/OTP-14481' ↵Erlang/OTP
into maint-20 * lukas/erts/fix_outputv_port_task_cleanup/ERL-428/OTP-14481: fixup! erts: Cleanup dropped port tasks correctly erts: Add tests to detect port close race erts: Cleanup dropped port tasks correctly
2017-06-30Merge branch 'john/erts/fix-port-leak/OTP-13939/ERL-193' into maint-20Erlang/OTP
* john/erts/fix-port-leak/OTP-13939/ERL-193: Add a testcase for OTP-13939/ERL-193 Mark socket disconnected on tcp_send_or_shutdown_error # Conflicts: # lib/kernel/test/gen_tcp_misc_SUITE.erl
2017-06-30erts: Fix bug in quick allocSverker Eriksson
The effect of the race is that a pre-allocated memory block is inserted last without updating tail.data.last, which will cause all subsequent insertions to also fail to update tail.data.last. Hence all pre-allocation for this quick alloc instance is leaked for this thread and will fallback on erts_alloc.
2017-06-30Merge branch 'maint'Björn Gustavsson
* maint: Travis CI: Fix the build matrix
2017-06-30Travis CI: Fix the build matrixBjörn Gustavsson
Some changes in Travis CI resulted in only a build for 32-bit Linux.
2017-06-29ssl: Move clause so that it will matchIngela Anderton Andin
2017-06-29[dbg] Fix encoding commentSiri Hansen
Encoding specified in a comment must be 'utf-8' instead of 'utf8'.
2017-06-29Update appups in kernel, stdlib, and sasl for OTP-21.0Siri Hansen
2017-06-29[ct_make] Do not use the interactive tool 'c' from ct_makeSiri Hansen
2017-06-29Use current dir as default outdir for c:c/1,2Siri Hansen
In OTP-20, c:c/1,2 started using the directory of the source file as default output directory. For backwards compatibility reasons this is now reversed so the current directory is used instead.
2017-06-29[make] Do not use the interactive tool 'c' from makeSiri Hansen
2017-06-29Merge branch 'maint'Sverker Eriksson
2017-06-29Merge branch 'sverker/erts/apply-badarg/ERL-432/OTP-14490' into maintSverker Eriksson
* sverker/erts/apply-badarg/ERL-432/OTP-14490: erts: Make apply throw 'badarg' if Args is not a list
2017-06-29Merge branch 'maint'Ingela Anderton Andin
2017-06-29Merge branch 'ingela/ssl/crl-test-cuddle' into maintIngela Anderton Andin
* ingela/ssl/crl-test-cuddle: ssl: Skip test if OpenSSL has problems generating CRL
2017-06-29ssl: Skip test if OpenSSL has problems generating CRLIngela Anderton Andin
2017-06-29Merge branch 'maint'Ingela Anderton Andin
2017-06-29Merge branch 'ingela/ssl/timeout-cuddle' into maintIngela Anderton Andin
* ingela/ssl/timeout-cuddle: ssl: Set rizzo* test timeout high enough for our slowest test machine
2017-06-29ssl: Set rizzo* test timeout high enough for our slowest test machineIngela Anderton Andin
2017-06-28Merge branch 'bjorn/erts/minor-beam-ops-enhancements'Björn Gustavsson
* bjorn/erts/minor-beam-ops-enhancements: Reduce C code size for bit syntax instructions ops.tab: Use combined operands
2017-06-28Reduce C code size for bit syntax instructionsBjörn Gustavsson
Bit syntax instructions never store their result in a Y register. Therefore, change the bit syntax instructions to use 'x' as the destination instead of 'd'. That will simplify the code that stores the result, and will be a slight reduction in code size and execution time.
2017-06-28ops.tab: Use combined operandsBjörn Gustavsson
2017-06-28Merge branch 'maint'Björn Gustavsson
* maint: Eliminate potential unsafe use of general destination
2017-06-28Merge branch 'bjorn/erts/fix-gen-dest' into maintBjörn Gustavsson
* bjorn/erts/fix-gen-dest: Eliminate potential unsafe use of general destination
2017-06-28Merge branch 'john/erts/cleanup-dirty-asserts'John Högberg
2017-06-27erts: Make apply throw 'badarg' if Args is not a listSverker Eriksson
instead of a strange 'undef' exception.
2017-06-27Merge branch 'maint'John Högberg
* maint: Updated OTP version Update release notes Update version numbers Fix statistics(wall_clock) and statistics(runtime) implementation fixup! erts: Cleanup dropped port tasks correctly erts: Add tests to detect port close race Add a testcase for OTP-13939/ERL-193 erts: Cleanup dropped port tasks correctly Mark socket disconnected on tcp_send_or_shutdown_error
2017-06-27Merge branch 'maint-19' into maintJohn Högberg
* maint-19: Updated OTP version Update release notes Update version numbers Fix statistics(wall_clock) and statistics(runtime) implementation fixup! erts: Cleanup dropped port tasks correctly erts: Add tests to detect port close race Add a testcase for OTP-13939/ERL-193 erts: Cleanup dropped port tasks correctly Mark socket disconnected on tcp_send_or_shutdown_error
2017-06-27Merge branch 'maint'Ingela Anderton Andin
2017-06-27Merge branch 'ingela/ssl/test-checks' into maintIngela Anderton Andin
* ingela/ssl/test-checks: ssl: Skip sslv2 hello compatible tests on OpenSSL-0.9.8o ssl: Skip sslv3 interop with newer OpenSSL ssl: Increase timeout for testcase testing ECDH keyexchange with RSA signed certs
2017-06-27ssl: Skip sslv2 hello compatible tests on OpenSSL-0.9.8oIngela Anderton Andin
The -ssl2 option to s_client appears to be broken on this release. This is a legacy option anyway that is still tested on other old version of OpenSSL so skip this.
2017-06-26Updated OTP versionOTP-19.3.6.1Erlang/OTP
2017-06-26Update release notesErlang/OTP
2017-06-26Update version numbersErlang/OTP