aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-11-23Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
* hans/ssh/cuddle_tests: ssh: remove left-over msg traceing
2017-11-23Merge branch 'hans/asn1/asn1ct_test_fix/ERL-518/OTP-14787' into maintHans Nilsson
* hans/asn1/asn1ct_test_fix/ERL-518/OTP-14787: asn1: asn1:test now handles no_ok_wrapper and undec_rest
2017-11-23Merge branch 'hans/asn1/catch_error/ERL-518/OTP-14786' into maintHans Nilsson
2017-11-23Merge branch 'hans/crypto/doc_engine_keys/OTP-14735' into maintHans Nilsson
2017-11-22ssh: remove left-over msg traceingHans Nilsson
2017-11-22Merge branch 'hans/crypto/cuddle_tests' into maintHans Nilsson
2017-11-21asn1: asn1:test now handles no_ok_wrapper and undec_restHans Nilsson
2017-11-21Merge branch 'sverker/nif-debug-bin-check' into maintSverker Eriksson
2017-11-21Merge branch 'sverker/crypto/fix-valgrind-assert' into maintSverker Eriksson
2017-11-21asn1: Further adjustments on generated codeHans Nilsson
2017-11-21asn1: Protect more by try..catchHans Nilsson
2017-11-21ssl: Marker inserted to enable a reference from cryptoHans Nilsson
2017-11-21crypto: Changes after reviewHans Nilsson
2017-11-21crypto: Fixes to make privkey_to_pubkey behave similar to other functionsHans Nilsson
2017-11-20Remove core dump risk in crypto.cHans Nilsson
2017-11-20crypto: Printout polishingHans Nilsson
2017-11-20crypto: Correct and extends tests of key fetching/usageHans Nilsson
2017-11-20crypto: Engine stored keys docHans Nilsson
2017-11-20Merge branch 'maint-20' into maintHans Nilsson
* maint-20: Updated OTP version Prepare release ssh: testcases for space trailing Hello msg ssh: Don't remove trailing WS in Hello msg ssh: dialyzer fixes ssh: Fix broken error handling during session setup Remove invalid EINTR loop around close(2) Conflicts: lib/ssh/test/ssh_options_SUITE.erl
2017-11-20Merge branch 'lukas/system/improve_profile_docs/OTP-14633' into maintLukas Larsson
* lukas/system/improve_profile_docs/OTP-14633: erts: Add term2bin note about encoding guarantee Fix broken link in INSTALL howto system: Add info to profiling effeciency guide Update message queue and pinfo binary docs kernel: Clarify gen_tcp:listen documentation system: Add External OSS tools section to profiling guilde
2017-11-20Merge branch 'lukas/compiler/add_to_dis/OTP-14784' into maintLukas Larsson
* lukas/compiler/add_to_dis/OTP-14784: compiler: Add +to_dis option that dumps loaded asm
2017-11-20compiler: Add +to_dis option that dumps loaded asmLukas Larsson
2017-11-20Merge branch 'lukas/docs/xmllint_fixes/OTP-14721' into maintLukas Larsson
* lukas/docs/xmllint_fixes/OTP-14721: ssl/ssh: Remove/ignore unused XML_FILES doc files Refactor xmllint check and make it fail on failure Add toplevel xmllint make target Conflicts: lib/crypto/doc/src/Makefile
2017-11-20ssl/ssh: Remove/ignore unused XML_FILES doc filesLukas Larsson
2017-11-17Updated OTP versionOTP-20.1.6Erlang/OTP
2017-11-17Prepare releaseErlang/OTP
2017-11-17Merge branch 'rickard/node-mon-proc-exit-race/maint-20/OTP-14781' into maint-20Erlang/OTP
* rickard/node-mon-proc-exit-race/maint-20/OTP-14781: Fix triggering of node monitors
2017-11-17Merge branch 'hans/ssh/SYN_RST/OTP-14778' into maint-20Erlang/OTP
* hans/ssh/SYN_RST/OTP-14778: ssh: dialyzer fixes ssh: Fix broken error handling during session setup
2017-11-17Merge branch 'hans/ssh/dont_remove_trailing_ws_20/OTP-14763' into maint-20Erlang/OTP
* hans/ssh/dont_remove_trailing_ws_20/OTP-14763: ssh: testcases for space trailing Hello msg ssh: Don't remove trailing WS in Hello msg
2017-11-17Merge branch 'john/erts/fix-close-eintr/OTP-14775' into maint-20Erlang/OTP
* john/erts/fix-close-eintr/OTP-14775: Remove invalid EINTR loop around close(2)
2017-11-17Merge branch 'ingela/inets/httpc/ERL-473/OTP-14783' into maintIngela Anderton Andin
* ingela/inets/httpc/ERL-473/OTP-14783: inets: Eliminate race condition
2017-11-17inets: Eliminate race conditionIngela Anderton Andin
Only run test case for http as the socket manipulation done by the test case requires much more manipulation to work for https. However, that this test case started failing constantly instead of sporadically is proof that this change is a good thing.
2017-11-16Merge branch 'maint' of github.com:erlang/otp into maintHans Nilsson
2017-11-16Merge branch 'maint-18' into maintHans Nilsson
* maint-18: Updated OTP version Prepare release ssh: Unicode encoding fix ssh: testcases for space trailing Hello msg Remove unused test include file from test suites eldap: Repair Makefile ssh: Don't remove trailing WS in Hello msg Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/vsn.mk lib/compiler/doc/src/notes.xml lib/compiler/vsn.mk lib/crypto/test/blowfish_SUITE.erl lib/eldap/doc/src/notes.xml lib/eldap/vsn.mk lib/inets/test/httpd_load.erl lib/inets/test/httpd_mod.erl lib/inets/test/old_httpd_SUITE.erl lib/ssh/doc/src/notes.xml lib/ssh/vsn.mk lib/stdlib/test/zip_SUITE.erl otp_versions.table
2017-11-16Merge branch 'rickard/node-mon-proc-exit-race/maint-20/OTP-14781' into maintRickard Green
* rickard/node-mon-proc-exit-race/maint-20/OTP-14781: Fix triggering of node monitors
2017-11-16Fix triggering of node monitorsRickard Green
2017-11-16Merge branch 'rickard/node-mon-proc-exit-race/OTP-14781' into maintRickard Green
* rickard/node-mon-proc-exit-race/OTP-14781: Fix triggering of node monitors
2017-11-16Merge branch 'ingela/ssl/code-enhance' into maintIngela Anderton Andin
* ingela/ssl/code-enhance: ssl: Align code of TLS/DTLS handshake handling ssl: Align code of TLS/DTLS record handling ssl: Align code of main modules implementing the gen_statem behaviour dtls: Add state spec
2017-11-16ssl: Align code of TLS/DTLS handshake handlingIngela Anderton Andin
2017-11-16ssl: Align code of TLS/DTLS record handlingIngela Anderton Andin
2017-11-16ssl: Align code of main modules implementing the gen_statem behaviourIngela Anderton Andin
2017-11-16dtls: Add state specIngela Anderton Andin
2017-11-15Fix triggering of node monitorsRickard Green
2017-11-15Merge branch 'hasse/edoc/fix_map_type/OTP-14777' into maintHans Bolinder
* hasse/edoc/fix_map_type/OTP-14777: edoc: The map type is denoted map()
2017-11-15ssh: testcases for space trailing Hello msgHans Nilsson
2017-11-15ssh: Don't remove trailing WS in Hello msgHans Nilsson
2017-11-15Updated OTP versionOTP-18.3.4.6Erlang/OTP
2017-11-15Prepare releaseErlang/OTP
2017-11-15Merge branch 'hans/ssh/dont_remove_trailing_ws_18/OTP-14763' into maint-18Erlang/OTP
* hans/ssh/dont_remove_trailing_ws_18/OTP-14763: ssh: Unicode encoding fix ssh: testcases for space trailing Hello msg ssh: Don't remove trailing WS in Hello msg
2017-11-15Merge branch 'hans/fix_build_env/OTP-14765' into maint-18Erlang/OTP
* hans/fix_build_env/OTP-14765: Remove unused test include file from test suites eldap: Repair Makefile