aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-06-05Merge branch 'maint-20' into maintJohn Högberg
* maint-20: Updated OTP version Prepare release inets: Gracefully handle bad headers [erl_docgen] Update version [erl_docgen] Add missing file db_funcs.xsl to file list erts: Fix bug in system_profile erts: Fix bug in enif_binary_to_term for immediates
2018-06-05Updated OTP versionOTP-20.3.7Erlang/OTP
2018-06-05Prepare releaseErlang/OTP
2018-06-05Merge branch 'ingela/inets/header-handling/OTP-15092' into maint-20Erlang/OTP
* ingela/inets/header-handling/OTP-15092: inets: Gracefully handle bad headers
2018-06-05Merge branch 'lars/erl_docgen/fix-xsl-makefile/OTP-15091' into maint-20Erlang/OTP
* lars/erl_docgen/fix-xsl-makefile/OTP-15091: [erl_docgen] Update version [erl_docgen] Add missing file db_funcs.xsl to file list
2018-06-05Merge branch 'sverker/system-profile-bug/OTP-15085' into maint-20Erlang/OTP
* sverker/system-profile-bug/OTP-15085: erts: Fix bug in system_profile
2018-06-05Merge branch 'sverker/enif_binary_to_term-bug/OTP-15080' into maint-20Erlang/OTP
* sverker/enif_binary_to_term-bug/OTP-15080: erts: Fix bug in enif_binary_to_term for immediates
2018-05-22inets: Gracefully handle bad headersIngela Anderton Andin
max_headers operated on the individual header length instead of the total length of all headers. Also headers with empty keys are now discarded.
2018-05-21[erl_docgen] Update versionLars Thorsen
2018-05-21[erl_docgen] Add missing file db_funcs.xsl to file listLars Thorsen
2018-05-18erts: Fix bug in system_profileSverker Eriksson
seen to cause redundant {profile,_,active,_,_} messages when process is terminating.
2018-05-16erts: Fix bug in enif_binary_to_term for immediatesSverker Eriksson
Symptom: Heap corruption Expanded test case to provoke this bug and test some more term types.
2018-05-09Merge branch 'maint-19' into maintHans Nilsson
* maint-19: Updated OTP version Prepare release ssh: Renegotiation -> renegotiate ssh: Fix DH group exchange server bug for PuTTY and others following draft-draft-00 from 2001 and not the rfc4419 ssh: Fix server crashes for exit-normal signals Conflicts: OTP_VERSION lib/ssh/doc/src/notes.xml lib/ssh/src/ssh_connection_handler.erl lib/ssh/src/ssh_transport.erl lib/ssh/vsn.mk otp_versions.table
2018-05-08Updated OTP versionOTP-19.3.6.9Erlang/OTP
2018-05-08Prepare releaseErlang/OTP
2018-05-08Merge branch 'hans/ssh/reneg_bug_19/OTP-15066' into maint-19Erlang/OTP
* hans/ssh/reneg_bug_19/OTP-15066: ssh: Renegotiation -> renegotiate
2018-05-08Merge branch 'hans/ssh/dh_gex_putty_19/OTP-15064' into maint-19Erlang/OTP
* hans/ssh/dh_gex_putty_19/OTP-15064: ssh: Fix DH group exchange server bug for PuTTY and others following draft-draft-00 from 2001 and not the rfc4419
2018-05-08Merge branch 'hans/ssh/server_exit_normal_exit_19/OTP-15018' into maint-19Erlang/OTP
* hans/ssh/server_exit_normal_exit_19/OTP-15018: ssh: Fix server crashes for exit-normal signals
2018-05-08Merge branch 'maint-20' into maintHans Nilsson
* maint-20: Updated OTP version Prepare release ssh: Renegotiation -> renegotiate ssh: Fix DH group exchange server bug for PuTTY and others following draft-draft-00 from 2001 and not the rfc4419 crypto: get_engine_load_cmd_list excluded if no engine support crypto: Fix compilation for LibreSSL 2.7.x crypto: Disable test_engine if engine is disabled crypto: disable engine if OPENSSL_NO_EC* is set If that flag is set, and openssl/engine.h is included, there will be an erro further down in files included by engine.h
2018-05-07Updated OTP versionOTP-20.3.6Erlang/OTP
2018-05-07Prepare releaseErlang/OTP
2018-05-07Merge branch 'hans/ssh/reneg_bug_20/OTP-15066' into maint-20Erlang/OTP
* hans/ssh/reneg_bug_20/OTP-15066: ssh: Renegotiation -> renegotiate
2018-05-07Merge branch 'hans/ssh/dh_gex_putty/OTP-15064' into maint-20Erlang/OTP
* hans/ssh/dh_gex_putty/OTP-15064: ssh: Fix DH group exchange server bug for PuTTY and others following draft-draft-00 from 2001 and not the rfc4419
2018-05-07Merge branch 'hans/crypto/OPENSSL_NO_EC/OTP-15073' into maint-20Erlang/OTP
* hans/crypto/OPENSSL_NO_EC/OTP-15073: crypto: Disable test_engine if engine is disabled crypto: disable engine if OPENSSL_NO_EC* is set If that flag is set, and openssl/engine.h is included, there will be an erro further down in files included by engine.h
2018-05-07Merge branch 'hans/crypto/libressl_errors/OTP-15074' into maint-20Erlang/OTP
* hans/crypto/libressl_errors/OTP-15074: crypto: get_engine_load_cmd_list excluded if no engine support crypto: Fix compilation for LibreSSL 2.7.x
2018-05-04ssh: Renegotiation -> renegotiateHans Nilsson
2018-05-04ssh: Fix DH group exchange server bug for PuTTYHans Nilsson
and others following draft-draft-00 from 2001 and not the rfc4419
2018-05-04crypto: get_engine_load_cmd_list excluded if no engine supportHans Nilsson
2018-05-04crypto: Fix compilation for LibreSSL 2.7.xHans Nilsson
2018-05-04crypto: Disable test_engine if engine is disabledHans Nilsson
2018-05-04crypto: disable engine if OPENSSL_NO_EC* is setHans Nilsson
If that flag is set, and openssl/engine.h is included, there will be an erro further down in files included by engine.h
2018-05-03Merge branch 'maint-20' into maintJohn Högberg
* maint-20: Updated OTP version Update release notes Update version numbers ssl: Prepare for release ssl: Proper handling of clients that choose to send an empty answer to a certificate request heart: Use ntohs instead of manual conversion
2018-05-02Updated OTP versionOTP-20.3.5Erlang/OTP
2018-05-02Update release notesErlang/OTP
2018-05-02Update version numbersErlang/OTP
2018-05-02Merge branch 'ingela/ssl/client-has-no-cert/ERL-599/OTP-15050' into maint-20Erlang/OTP
* ingela/ssl/client-has-no-cert/ERL-599/OTP-15050: ssl: Prepare for release ssl: Proper handling of clients that choose to send an empty answer to a certificate request
2018-05-02Merge branch 'john/erts/fix-heart-command-overflow/OTP-15034/ERIERL-166' ↵Erlang/OTP
into maint-20 * john/erts/fix-heart-command-overflow/OTP-15034/ERIERL-166: heart: Use ntohs instead of manual conversion # Conflicts: # lib/kernel/test/heart_SUITE.erl
2018-05-02ssh: Renegotiation -> renegotiateHans Nilsson
2018-05-02ssh: Fix DH group exchange server bug for PuTTYHans Nilsson
and others following draft-draft-00 from 2001 and not the rfc4419
2018-04-27ssl: Prepare for releaseIngela Anderton Andin
2018-04-27ssl: Proper handling of clients that choose to send an emptyIngela Anderton Andin
answer to a certificate request Solves ERL-599
2018-04-24heart: Use ntohs instead of manual conversionJohn Högberg
Multiplying a signed char by 256 is undefined behavior and caused problems on some platforms when the length was long enough. We could cast it to an unsigned int to make it work, but it's best not to reinvent the wheel. Fixes OTP-15034
2018-04-24Merge branch 'maint-18' into maintHans Nilsson
* maint-18: Updated OTP version Prepare release ssh: Fix server crashes for exit-normal signals Conflicts: OTP_VERSION lib/ssh/doc/src/notes.xml lib/ssh/src/ssh_connection_handler.erl lib/ssh/vsn.mk otp_versions.table
2018-04-23Updated OTP versionOTP-18.3.4.9Erlang/OTP
2018-04-23Prepare releaseErlang/OTP
2018-04-23Merge branch 'hans/ssh/server_exit_normal_exit/OTP-15018' into maint-18Erlang/OTP
* hans/ssh/server_exit_normal_exit/OTP-15018: ssh: Fix server crashes for exit-normal signals
2018-04-20Merge branch 'maint-20' into maintHans Nilsson
* maint-20: Updated OTP version Prepare release erl_interface: Optimize latin1_to_utf8 and friend inets: Fix broken httpc options handling erl_interface: Fix ei_connect ssh: Fix server crashes for exit-normal signals ssh: Fix ssh_sftpd:handle_op not returning State ic: Optimize oe_ei_encode_atom
2018-04-19Updated OTP versionOTP-20.3.4Erlang/OTP
2018-04-19Prepare releaseErlang/OTP
2018-04-19Merge branch 'sverker/optimize-atom-enc-dec/ERIERL-150/OTP-15023' into maint-20Erlang/OTP
* sverker/optimize-atom-enc-dec/ERIERL-150/OTP-15023: erl_interface: Optimize latin1_to_utf8 and friend ic: Optimize oe_ei_encode_atom