aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-10-17Merge branch 'maint'Ingela Anderton Andin
2017-10-17Merge branch 'ingela/ssl/extend-hostname-check/OTP-14632/OTP-14655' into maintIngela Anderton Andin
* ingela/ssl/extend-hostname-check/OTP-14632/OTP-14655: ssl: Fix test cases to work on all test platforms public_key: Fix dialyzer spec ssl: Sessions must be registered with SNI if exists ssl: Extend hostname check to fallback to checking IP-address public_key, ssl: Handles keys so that APIs are preserved correctly
2017-10-17Merge branch 'siri/observer/multiple-ms-clauses/ERL-489' into maintSiri Hansen
* siri/observer/multiple-ms-clauses/ERL-489: Allow multiple clauses in match spec
2017-10-17Merge branch 'maint'Hans Bolinder
* maint: stdlib: Make ets:i/1 exit cleaner upon ^D (old Erlang shell)
2017-10-17Merge branch 'hasse/stdlib/fix_ets_i_1/OTP-14663' into maintHans Bolinder
* hasse/stdlib/fix_ets_i_1/OTP-14663: stdlib: Make ets:i/1 exit cleaner upon ^D (old Erlang shell)
2017-10-17Merge branch 'maint'Lukas Larsson
2017-10-17Merge branch 'lukas/jinterface/disable-travis' into maintLukas Larsson
* lukas/jinterface/disable-travis: jinterface: Skip tests when hostname cannot be resolved
2017-10-17Merge branch 'dgud/dot_erlang/OTP-14439'Dan Gudmundsson
* dgud/dot_erlang/OTP-14439: fixup! Do not load .erlang from current dir erlc: Do not load .erlang escript: Do not load .erlang dialyzer: Do not load .erlang reltool: Add no_dot_erlang bootfiles Enable usage of no_dot_erlang in bootstrap Do not load .erlang from current dir
2017-10-17Merge branch 'dgud/kernel/get_chars_raw_echo_off'Dan Gudmundsson
* dgud/kernel/get_chars_raw_echo_off: Let io:get_chars/2 (echo off) fetch chars without eol
2017-10-16Merge branch 'maint'Sverker Eriksson
2017-10-16Merge branch 'sverker/cerl-rr' into maintSverker Eriksson
* sverker/cerl-rr: erts: Add -rr option to cerl start script
2017-10-16jinterface: Skip tests when hostname cannot be resolvedLukas Larsson
Check that the hostname can be resolved by the native resolver. What normally has happened when it cannot is that gethostname() returned a fqdn and `hostname -s` is not part of /etc/hosts. This is solved on the erlang side by adding `hostname -s` to inet_db, but java does not have a similar mechanism, so it fails when it tries to connect to `hostname -s`. This caused jinterface tests to fail when run in such an environment, and travis-ci recently started doing this.
2017-10-16Merge branch 'maint'Ingela Anderton Andin
Conflicts: lib/ssl/src/ssl_connection.erl
2017-10-16Merge branch 'ingela/ssl/funtion-name-macro' into maintIngela Anderton Andin
* ingela/ssl/funtion-name-macro: ssl: Use ?FUNCTION_NAME
2017-10-16 ssl: Use ?FUNCTION_NAMEIngela Anderton Andin
Use ?FUNCTION_NAME macro to enhance code as we will not back-port this version of the ssl application to versions pre OTP 19.
2017-10-16Merge pull request #1601 from josevalim/patch-9Björn Gustavsson
Document the guarantees provided by get_stacktrace OTP-14687
2017-10-16Merge branch 'maint'Hans Nilsson
2017-10-16Merge branch 'hans/public_key/cuddle_docs' into maintHans Nilsson
2017-10-16public_key: Polish verify_hostname docHans Nilsson
2017-10-16Merge branch 'maint'Hans Nilsson
2017-10-16Merge branch 'hans/public_key/ssh2_pubkey_generate_fix/OTP-14570' into maintHans Nilsson
2017-10-16ssl: Fix test cases to work on all test platformsIngela Anderton Andin
Use hradcoded rsa keys as this will work on all legacy platforms. In test case dns_name_reuse only do the relevant client check in the final test.
2017-10-13Document the guarantees provided by get_stacktraceJosé Valim
2017-10-13Merge branch 'maint'Ingela Anderton Andin
2017-10-13Merge branch 'ingela/ssl/remove-deprcated-string' into maintIngela Anderton Andin
* ingela/ssl/remove-deprcated-string: ssl: Use new string functions
2017-10-13public_key: Fix dialyzer specIngela Anderton Andin
2017-10-13ssl: Sessions must be registered with SNI if existsIngela Anderton Andin
2017-10-13ssl: Extend hostname check to fallback to checking IP-addressIngela Anderton Andin
If no SNI is available and the hostname is an IP-address also check for IP-address match. This check is not as good as a DNS hostname check and certificates using IP-address are not recommended.
2017-10-13Update primary bootstrapBjörn Gustavsson
2017-10-13Merge pull request #1596 from bjorng/bjorn/enhance-try-catchBjörn Gustavsson
(Slightly) optimize catch and try/catch OTP-14683
2017-10-13Merge pull request #1599 from kostis/exception_SUITEBjörn Gustavsson
Explicitly disable HiPE's range analysis
2017-10-13Merge pull request #1600 from kostis/hipe-tests-eclectic-exceptionsBjörn Gustavsson
hipe: Extend the basic_SUITE with one more test
2017-10-12erts: Add -rr option to cerl start scriptSverker Eriksson
to run beam with "rr record".
2017-10-12Merge branch 'lukas/erts/use_SIGRTMIN_for_sys_suspend/OTP-14682'Lukas Larsson
* lukas/erts/use_SIGRTMIN_for_sys_suspend/OTP-14682: erts: Use SIGRTMIN on linux for sys_suspend
2017-10-12erts: Use SIGRTMIN on linux for sys_suspendLukas Larsson
The Linux real-time signal is better used on Linux for suspending schedulers during shutdown as it doesn't collide with SIGUSR2 usage of other applications.
2017-10-12Merge branch 'lukas/erts/poll-thread/OTP-14346'Lukas Larsson
* lukas/erts/poll-thread/OTP-14346: erts: Make a copy of erl_poll.c to help debuggers
2017-10-12Merge branch 'rickard/null-chars/ERL-370/OTP-14543'Rickard Green
* rickard/null-chars/ERL-370/OTP-14543: Don't allow null chars in various strings Conflicts: erts/emulator/beam/erl_alloc.types erts/preloaded/ebin/erlang.beam
2017-10-12ssh: Adapt to simplified public_key and simplify sshHans Nilsson
2017-10-12public_key: Remove dead codeHans Nilsson
2017-10-12public_key: Remove extra unused element in internal pubkey_ssh:encode/2Hans Nilsson
2017-10-12Merge branch 'maint'Hans Nilsson
2017-10-12Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
2017-10-12ssh: Anonymize unused variables in test suitesHans Nilsson
2017-10-12Merge branch 'maint'Rickard Green
* maint: Revert "Merge branch 'rickard/null-char-filenames/ERL-370/OTP-14543' into maint"
2017-10-12Revert "Merge branch 'rickard/null-char-filenames/ERL-370/OTP-14543' into maint"Rickard Green
This reverts commit 0717a2194e863f3a78595184ccc5637697f03353, reversing changes made to 71a40658a0cef8b3e25df3a8e48a72d0563a89bf.
2017-10-12ssh: ssh_bench_SUITE disable aes_gcmHans Nilsson
2017-10-12ssh: remove dead codeHans Nilsson
2017-10-12public_key, ssl: Handles keys so that APIs are preserved correctlyIngela Anderton Andin
2017-10-12Merge branch 'maint'Hans Nilsson
2017-10-12Merge branch 'hans/public_key/fix_verif_host_ip_addr_bug' into maintHans Nilsson