aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-06-07Merge branch 'ingela/ssl/unexpected-client-cert/OTP-13651'Ingela Anderton Andin
* ingela/ssl/unexpected-client-cert/OTP-13651: ssl: Reject unrequested client cert
2016-06-07Merge branch 'raimo/kernel/test-cuddling'Raimo Niskanen
* raimo/kernel/test-cuddling: Explain how to make inet_res_SUITE not skip gethostbyname, gethostbyaddr
2016-06-07Merge branch 'ingela/ssl/max-session-table/OTP-13490'Ingela Anderton Andin
* ingela/ssl/max-session-table/OTP-13490: ssl: Mitigate load increase when the whole session table is invalidated
2016-06-07Merge branch 'ingela/public_key/doc/OTP-13186'Ingela Anderton Andin
* ingela/public_key/doc/OTP-13186: public_key: Create application manual page that is man(6)
2016-06-07Merge branch 'hans/inets/ftp/fix_bugs/OTP-13644'Hans Nilsson
2016-06-07Merge branch 'hans/eldap/cuddle_tests'Hans Nilsson
2016-06-07Merge branch 'hans/ssh/use_open_socket/OTP-12860'Hans Nilsson
2016-06-07Merge branch 'lucafavatella/otp/remove-dead-code/PR-1085'Björn-Egil Dahlberg
* lucafavatella/otp/remove-dead-code/PR-1085: Delete dead code in `otp_build` script
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-03ssl: Reject unrequested client certIngela Anderton Andin
2016-06-03ssl: Mitigate load increase when the whole session table is invalidatedIngela Anderton Andin
2016-06-03Merge remote-tracking branch 'github/pr/1087'Ingela Anderton Andin
* github/pr/1087: Move misplaced period in ssl documentation
2016-06-03Explain how to make inet_res_SUITE not skipRaimo Niskanen
2016-06-03public_key: Create application manual page that is man(6)Ingela Anderton Andin
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-03gethostbyname, gethostbyaddrRaimo Niskanen
2016-06-03ftp: make rottend tc:s work againHans Nilsson
2016-06-03ftp: Test suites updatesHans Nilsson
- add timetrap to ftp test suite - removed non-existing tc from ftp_SUITE:all() - moved tc:s missplaced in ftp_SUITE
2016-06-03ftp: fix error code errors incl extend test suitesHans Nilsson
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-03Update primary bootstrapBjörn Gustavsson
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-03Update primary bootstrapBjörn-Egil Dahlberg
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-03Delete dead code in `otp_build` scriptLuca Favatella
In options `plain` and `smp`, code checking for option being `opt` had been dead since R12B-5.
2016-06-02ssh: temp fix hazard in test suiteHans Nilsson
2016-06-02ftp: close lsock without crashHans Nilsson
2016-06-02eldap: increase test suite timetrapHans Nilsson
A couple of test machines seem to have slow networking (?), so the remote eldap server initialization is aborted in init_per_suite
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-02Merge branch 'rickard/dirty_process_main-fix/OTP-13123'Rickard Green
* rickard/dirty_process_main-fix/OTP-13123: Fix erts_dirty_process_main()
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-02Fix erts_dirty_process_main()Rickard Green
2016-06-02Revert "Updated OTP version"Erlang/OTP
This reverts commit 2c9dba638a8bda92e3db2d5c07e6ba251330c7ca.
2016-06-02Revert "Prepare release"Erlang/OTP
This reverts commit e020f75c10410a6943cd055bfa072a2641eab7da.
2016-06-02Updated OTP versionOTP-19.0-rc2Erlang/OTP
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-02Merge branch 'saleyn/uds/PR-612/OTP-13572'Raimo Niskanen
* saleyn/uds/PR-612/OTP-13572: AF_UNIX is more portable
2016-06-02AF_UNIX is more portableRaimo Niskanen
Fix dialyzer warning for improper list in prim_inet by not using an improper list.
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