aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-02-23Merge branch 'sverker/include-module-literal-size/OTP-14228' into maintSverker Eriksson
again * sverker/include-module-literal-size: erts: Beautify loaded() erts: Fix literal size bug when only old instance exists
2017-02-22Merge branch 'ingela/ssl/default-ciphers-suites/OTP-14235' into maintIngela Anderton Andin
* ingela/ssl/default-ciphers-suites/OTP-14235: ssl: Always prefer AES over 3DES
2017-02-22Merge branch 'lukas/kernel/fix_os_cmd_close_race/OTP-14232' into maintLukas Larsson
* lukas/kernel/fix_os_cmd_close_race/OTP-14232: kernel: Fix hanging os:cmd race condition
2017-02-22Merge branch 'lukas/erts/port_control_emasculate_binary/OTP-14231' into maintLukas Larsson
* lukas/erts/port_control_emasculate_binary/OTP-14231: erts: Emasculate binaries that are scheduled in port_control
2017-02-22Merge branch 'lukas/kernel/fail-sticky_dir-if-not-sticky' into maintLukas Larsson
* lukas/kernel/fail-sticky_dir-if-not-sticky: kernel: Fail sticky_dir tc if module not sticky
2017-02-22Merge pull request #1351 from stevendanna/ssl_session_cache_api_size_docsIngela Andin
Document ssl_session_cache_api's size/1 callback
2017-02-22Merge branch 'hasse/stdlib/fix_pretty_maps/OTP-14175' into maintHans Bolinder
* hasse/stdlib/fix_pretty_maps/OTP-14175: stdlib: Improve pretty-printing of terms with maps
2017-02-22Merge branch 'lars/xmerl/sax-parser-multi-doc-problem' into maintLars Thorsen
* lars/xmerl/sax-parser-multi-doc-problem: [xmerl] Remove faulty throws [xmerl] Fix XML "well-formedness" bug i SAX parser [xmerl] Correct bug handling multiple documents on a stream OTP-14211 OTP-14213
2017-02-22Merge branch 'siri/ct/get_dirs_from_testspec/OTP-14132' into maintSiri Hansen
* siri/ct/get_dirs_from_testspec/OTP-14132: [ct] Add ct_testspec:get_tests/1
2017-02-22[xmerl] Remove faulty throwsLars Thorsen
2017-02-22[xmerl] Fix XML "well-formedness" bug i SAX parserLars Thorsen
Changed the XML Sax parser behaviour so it returns an error if there are something more in the file after the the matching document. If one using the xmerl_sax_parser:stream() a rest is allowed which then can be sent to a new call of xmerl_sax_parser:stream() to parse next document. This is done to be compliant with XML conformance tests.
2017-02-22[xmerl] Correct bug handling multiple documents on a streamLars Thorsen
Change how to interpret end of document to comply with Tim Brays comment on the standard. This makes it possible to handle more than one doc on a stream, the standard makes it impossible to know when the document is ended without waiting for the next document (and not always even that). Tim Brays comment about the trailing "Misc" rule: The fact that you're allowed some trailing junk after the root element, I decided (but unfortunately too late) is a real design error in XML. If I'm writing a network client, I'm probably going to close the link as soon as a I see the root element end-tag, and not depend on the other end closing it down properly. Furthermore, if I want to send a succession of XML documents over a network link, if I find a processing instruction after a root element, is it a trailer on the previous document, or part of the prolog of the next?
2017-02-21ssl: Always prefer AES over 3DESIngela Anderton Andin
AES256 was preferred over 3DES already, so this only makes sure AES128 is preferred over 3DES also. This changes the default but probably nobody will notice as a better algorithm will be chosen anyhow.
2017-02-21Merge branch 'legoscia/erl_interface/doc-no-tuple-funs/PR-1343/OTP-14233' ↵Björn-Egil Dahlberg
into maint * legoscia/erl_interface/doc-no-tuple-funs/PR-1343/OTP-14233: Documentation: tuple funs are unsupported
2017-02-21erts: Beautify loaded()Sverker Eriksson
by removing some unnecessary conditions and remove unused and faulty summation for 'cur' and 'old'.
2017-02-21erts: Fix literal size bug when only old instance existsSverker Eriksson
fix for already merged but not releases 808b2f4d53e446aed07f85716c5c4b85abb3d18a
2017-02-21Document ssl_session_cache_api's size/1 callbackSteven Danna
The size/1 callback was added as a non-optional callback in 42b8a29dbae1d626f32bc16dd81a129caf741138 but wasn't added to the documentation for the ssl_session_cache_api behavior. Signed-off-by: Steven Danna <[email protected]>
2017-02-21kernel: Fix hanging os:cmd race conditionLukas Larsson
If the port terminates before Port ! close is issued, there will be no 'closed' reply, so the old code would hang. As it turns out there is no way to figure out if a closed reply is supposed to come as that reply is sent after all links and monitors are triggered. So we have to use the synchronous port_close to close the port.
2017-02-21stdlib: Improve pretty-printing of terms with mapsHans Bolinder
As of committing this branch maps:fold/3 calls maps:to_list/1, which means that the time and memory needed for printing maps is not always proportional to the size of the generated deep list of characters.
2017-02-21erts: Emasculate binaries that are scheduled in port_controlLukas Larsson
2017-02-20Merge branch 'hans/ssh/iolist_on_unicode/ERL-364/OTP-14230' into maintHans Nilsson
2017-02-20Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
2017-02-20Merge branch 'hans/ssh/sftpd_fixes/OTP-14225' into maintHans Nilsson
2017-02-20kernel: Fail sticky_dir tc if module not stickyLukas Larsson
Running this test when for some reason stdlib has been unstickied could cause the emulator to die. So we check first to make sure that the expected files are sticky.
2017-02-17ssh: replace byte-only function with element-size agnosticHans Nilsson
An error report on ssh_cli pointed to a usage of erlang:iolist_size/1. It is replaced by a specialized function.
2017-02-17ssh: increase timetrap in ssh_to_openssh_SUITE to not interrupt some slow ↵Hans Nilsson
machines
2017-02-17Merge branch 'ssh_sftpd_relative_path' into hans/ssh/sftpd_fixes/OTP-14225Hans Nilsson
Conflicts: lib/ssh/test/ssh_sftpd_SUITE.erl
2017-02-17Merge branch 'ssh_sftpd_cwd_with_root' into hans/ssh/sftpd_fixes/OTP-14225Hans Nilsson
Conflicts: lib/ssh/test/ssh_sftpd_SUITE.erl
2017-02-17Merge branch 'hans/ssh/try_sftp_access_outside_root' into ↵Hans Nilsson
hans/ssh/sftpd_fixes/OTP-14225
2017-02-16Merge branch 'hans/ssh/ssh_acceptor_bug/OTP-14108' into maintHans Nilsson
2017-02-16Merge branch 'hans/public_key/ssh_fingerprint_algorithm_list/OTP-14223' into ↵Hans Nilsson
maint
2017-02-16Merge branch 'sverker/enif_send-noproc-fix/OTP-14229' into maintSverker Eriksson
* sverker/enif_send-noproc-fix: erts: Fix enif_send from noproc and no msg_env
2017-02-16Merge branch 'sverker/include-module-literal-size/OTP-14228' into maintSverker Eriksson
* sverker/include-module-literal-size: erts: Add size of literals to module code size
2017-02-16Merge branch 'sverker/round-bug/OTP-14227' into maintSverker Eriksson
* sverker/round-bug/OTP-14227: erts: Fix round/1 for large floats
2017-02-16Merge branch 'lars/xmerl/standard-namespace-problem/OTP-14139' into maintLars Thorsen
* lars/xmerl/standard-namespace-problem/OTP-14139: [xmerl] Correct handling of implicit XML namespace
2017-02-15ssh: handle return values and exceptions from ssh_acceptor:handle_connectionHans Nilsson
2017-02-15ssh: More exact test for is_tcp_socketHans Nilsson
2017-02-15ssh: Add error case for bad socketHans Nilsson
2017-02-15ssh: speling errorHans Nilsson
2017-02-15ssh: speling errorHans Nilsson
2017-02-15ssh: reword documentationHans Nilsson
2017-02-15[xmerl] Correct handling of implicit XML namespaceLars Thorsen
The namespace_conformant option did not work when parsing documents without explicit XML namespace declaration.
2017-02-15Documentation: tuple funs are unsupportedMagnus Henoch
Remove use of tuple fun from erl_call documentation. It seems like fun math:sqrt/1 isn't parsed correctly by erl_call, so I replaced the example with a simpler one that doesn't require a fun.
2017-02-15Return correct state in the case of failureKarolis Petrauskas
2017-02-14ssh: allow a list of fingerprint algos in silently_accept_hosts optionHans Nilsson
2017-02-14public_key: generate a list of ssh fingerprints on requestHans Nilsson
2017-02-14Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
2017-02-14erts: Fix round/1 for large floatsSverker Eriksson
1> round(6209607916799025.0). 6209607916799026 Problem: Adding/subtracting 0.5 and large double floats between (1 bsl 52) and (1 bsl 53) does not give reliable results. Solution: Use round() function in math.h.
2017-02-14ssh: new test - try access outside sftp treeHans Nilsson
2017-02-14Merge branch 'ingela/ssl/handshake-match/ERL-347/OTP-14222' into maintIngela Anderton Andin
* ingela/ssl/handshake-match/ERL-347/OTP-14222: ssl: Test case robustness ssl: Avoid SSL/TLS hello format confusion