aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2016-06-07Merge branch 'hans/ssh/use_open_socket/OTP-12860'Hans Nilsson
2016-06-07Merge branch 'ingela/public_key/ERL-129/OTP-13554'Ingela Anderton Andin
* ingela/public_key/ERL-129/OTP-13554: public_key: Support more general name types
2016-06-07Merge branch 'dgud/wx/change-async-error'Dan Gudmundsson
* dgud/wx/change-async-error: wx: Change async error handling
2016-06-07Merge branch 'ingela/ssl/phase-out-sslv2-hello/OTP-13465'Ingela Anderton Andin
* ingela/ssl/phase-out-sslv2-hello/OTP-13465: ssl: Add option to phase out support for sslv2 client hello
2016-06-07Merge branch 'dotsimon/erts/heart_no_kill/OTP-13650'Lukas Larsson
* dotsimon/erts/heart_no_kill/OTP-13650: erts: make HEART_NO_KILL have to be set to TRUE Don't kill old erlang if HEART_NO_KILL is set Conflicts: lib/kernel/doc/src/heart.xml
2016-06-03Merge remote-tracking branch 'github/pr/1087'Ingela Anderton Andin
* github/pr/1087: Move misplaced period in ssl documentation
2016-06-03Merge branch 'kostis/edoc/add_specs/PR-1077'Dan Gudmundsson
* kostis/edoc/add_specs/PR-1077: edoc_run: Add types and specs
2016-06-03ssl: Add option to phase out support for sslv2 client helloIngela Anderton Andin
ssl servers can recognize sslv2 client hellos to interop with clients that support higher version of SSL/TLS but also offers sslv2 Conflicts: lib/ssl/src/tls_connection.erl
2016-06-03Merge branch 'bjorn/compiler/misc'Björn Gustavsson
* bjorn/compiler/misc: misc_SUITE: Cover the remaining lines in beam_peep Avoid the dreaded "no_file" in warnings Eliminate crash for map updates in guards beam_block: Eliminate crash in beam_utils
2016-06-03erts: make HEART_NO_KILL have to be set to TRUELukas Larsson
2016-06-03Move misplaced period in ssl documentationKenneth Lakin
2016-06-03Merge branch 'jv/compiler/mapsify-rec_env/PR-1082/OTP-13646'Björn-Egil Dahlberg
* jv/compiler/mapsify-rec_env/PR-1082/OTP-13646: Convert dict() to map() in rec_env.erl
2016-06-03wx: Change async error handlingDan Gudmundsson
Previously error from async functions made an exit when the next sync call checked the message queue. This have been changed to an error report instead since the errors where async there where really hard to handle. Also changed the error report format to make it easier to filter them with a custom error_handler.
2016-06-03public_key: Support more general name typesIngela Anderton Andin
2016-06-03misc_SUITE: Cover the remaining lines in beam_peepBjörn Gustavsson
2016-06-02ssh: temp fix hazard in test suiteHans Nilsson
2016-06-02Avoid the dreaded "no_file" in warningsBjörn Gustavsson
Add more filename/line number annotations while translating to Core Erlang in v3_core, and ensure that sys_core_fold retains existing annotations. The goal is to avoid that sys_core_fold generate warnings with "no_file" instead of a filename.
2016-06-02Eliminate crash for map updates in guardsBjörn Gustavsson
beam_validator would complain that x(1) is uninitialized in a test_heap instruction when attempting to compile the following code with sys_core_fold turned off: foo(M) when not (M#{true := 0}); [M] -> ok. Simplified, the generated BEAM assembly code looked like this: test is_map BadMap x(0) put_map_exact Fail x(0) => x(1) ... jump BooleanStuff BadMap: move ok => x(1) jump Fail BooleanStuff: ... move Boolean => x(2) jump Build Fail: move false => x(2) Build: test_heap 2 3 %% x(0), x(1), x(2) must be live. ... That is, if put_map_exact failed, control would transfer to the label Fail without initializing x(1). Fix that by making sure that x(1) is initilized even if put_map_exact fails: test is_map BadMap x(0) put_map_exact BadLbl x(0) => x(1) ... jump OkLbl BadLbl: move ok => x(1) jump Fail OkLbl: jump BooleanStuff BadMap: move ok => x(1) jump Fail BooleanStuff: ... move Boolean => x(2) jump Build Fail: move false => x(2) Build: test_heap 2 3 %% x(0), x(1), x(2) must be live. ... Note that this situation is rare, and that other optimization passes (beam_dead and beam_jump in particular) will clean up this mess.
2016-06-02Revert "Prepare release"Erlang/OTP
This reverts commit e020f75c10410a6943cd055bfa072a2641eab7da.
2016-06-02Prepare releaseErlang/OTP
2016-06-02Merge branch 'henrik/megaco-appup/OTP-13551'Henrik Nord
* henrik/megaco-appup/OTP-13551: fix appup for megaco
2016-06-02ssh: fix ssh_connection_SUITE error on WindowsHans Nilsson
2016-06-02Merge branch 'saleyn/uds/PR-612/OTP-13572'Raimo Niskanen
* saleyn/uds/PR-612/OTP-13572: Rewrite inet* for address family 'local' Rewrite inet_drv for AF_LOCAL Assign externally open fd to gen_tcp (UDS support) Conflicts: erts/preloaded/ebin/prim_inet.beam lib/kernel/doc/src/gen_tcp.xml lib/kernel/doc/src/gen_udp.xml lib/kernel/src/inet6_sctp.erl lib/kernel/test/inet_SUITE.erl
2016-06-01Convert dict() to map() in rec_env.erlJosé Valim
2016-06-01ssh: test cases on daemon using open socketHans Nilsson
2016-06-01ssh: better validationHans Nilsson
2016-06-01Merge branch 'sverker/ets-load-factor/OTP-13642'Sverker Eriksson
2016-06-01Temporally disable of failing ets_SUITE:memory_check_summarySverker Eriksson
Seems to be the growing meta tables that is causing increasing failed memchecks after load factor was lowered.
2016-06-01erts: Change ETS hash load factorSverker Eriksson
from 700% to 200%
2016-06-01ssh: daemon taking open socket as inputHans Nilsson
2016-06-01ssh: update connect docHans Nilsson
2016-06-01Rewrite inet* for address family 'local'Raimo Niskanen
2016-06-01Merge branch 'egil/lttng-cuddle-tests'Björn-Egil Dahlberg
* egil/lttng-cuddle-tests: erts: Cuddle with lttng_SUITE runtime_tools: Cuddle with t_receive tests
2016-06-01Merge branch 'siri/cuddle-master'Siri Hansen
* siri/cuddle-master: Change ct:sleep to timer:sleep where scaling is not wanted Don't generate ssh key files in netconf client test Ignore data received in break mode in test telnet_server Wait for process to die before next call Retry ct_telnet:get_data if no data is received after short wait Don't throw rest of line when NOP is received in test telnet_server Change ct:sleep to timer:sleep in telnet_server
2016-06-01Don't kill old erlang if HEART_NO_KILL is setSimon Cornish
If the environment variable HEART_NO_KILL is set then heart won't kill the old erlang process. This is desirable if the command executed by heart takes care of this.
2016-06-01[erl_docgen] Normalize space for content in a seealso elementLars Thorsen
2016-06-01[erl_docgen] Fix anchor bug for sections in ref manualsLars Thorsen
2016-06-01[erl_docgen] Fix support for quote tagLars Thorsen
2016-06-01[erl_docgen] Correct the handling of marker tagsLars Thorsen
Corrected how the generated html anchor is placed so the section title is visible after jump to the anchor.
2016-06-01[erl_docgen] Add new formatting for header level 4 and belowLars Thorsen
2016-06-01Make it possible to run xmllint target in system documentationLars Thorsen
2016-06-01fix appup for megacoHenrik Nord
2016-06-01Merge branch 'ingela/ssl/gen-statem-simplification'Ingela Anderton Andin
* ingela/ssl/gen-statem-simplification: ssl: simplyfy code using gen_statem
2016-06-01ssl: simplyfy code using gen_statemIngela Anderton Andin
2016-06-01ssh: Added timetrap to ssh_benchmark_SUITEHans Nilsson
2016-06-01ssh: replace ?config in testsHans Nilsson
OTP-13565
2016-06-01Merge branch 'hans/ssh/use_open_socket_client/OTP-12860'Hans Nilsson
2016-06-01Merge branch 'hans/ssh/spec_behaviours/OTP-13749'Hans Nilsson
2016-06-01Merge branch 'ingela/ssl/DH/OTP-13636'Ingela Anderton Andin
* ingela/ssl/DH/OTP-13636: ssl: Stronger default DH prime
2016-06-01Merge branch 'legoscia/ssl/tls-dist-more-opts/PR-956/OTP-13429'Raimo Niskanen
* legoscia/ssl/tls-dist-more-opts/PR-956/OTP-13429: Quote curly brackets in command line options Avoid disappearing ETS tables in ssl_dist_SUITE Fix db handle for TLS distribution crl_cache opts Fix ssl_dist_SUITE logging on Windows More logging in ssl_dist_SUITE TLS distribution: crl_check and crl_cache options Allow passing verify_fun for TLS distribution More informative malformed_ssl_dist_opt error