aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2019-05-07Merge branch 'maint-21' into maintIngela Anderton Andin
* maint-21: Updated OTP version Prepare release
2019-05-06Updated OTP versionOTP-21.3.8Erlang/OTP
2019-05-06Prepare releaseErlang/OTP
2019-05-06Merge branch 'sverker/process_info-reductions-fix/OTP-15793' into maint-21Erlang/OTP
* sverker/process_info-reductions-fix/OTP-15793: erts: Force process_info(reductions) as signal erts: Fix another bug in process_info(reductions)
2019-05-06Merge branch 'siri/ct/safe-write-log-cache/ERIERL-342/OTP-15758' into maint-21Erlang/OTP
* siri/ct/safe-write-log-cache/ERIERL-342/OTP-15758: [ct] Make sure log cache file is completely written before it is read
2019-05-06Merge branch 'siri/ct/reset_curr_tc/ERIERL-334/OTP-15717' into maint-21Erlang/OTP
* siri/ct/reset_curr_tc/ERIERL-334/OTP-15717: [ct] Cleanup after timetrap timeout or kill during framework call or hook # Conflicts: # lib/common_test/test/Makefile
2019-05-06Merge branch 'siri/ct/fuzzer_support/ERIERL-143/OTP-14746' into maint-21Erlang/OTP
* siri/ct/fuzzer_support/ERIERL-143/OTP-14746: [ct] Remove deprecated call to erlang:get_stacktrace() [ct] Fix bug with faulty suite name in end_per_suite config [ct] Add {testcase,TC,RepeatProps} syntax for repeating test cases [ct] Add post_groups/2 and post_all/3 hook functions # Conflicts: # lib/common_test/doc/src/ct_hooks.xml # lib/common_test/src/ct_hooks.erl # lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
2019-05-06Merge branch 'raimo/stdlib/gen_statem-sync-timer-cancel/OTP-15295' into maint-21Erlang/OTP
* raimo/stdlib/gen_statem-sync-timer-cancel/OTP-15295: Rewrite to use synchronous timer cancel
2019-05-06Merge branch ↵Erlang/OTP
'ingela/ssl/backported-ssl-enhancments/ERL-929/ERL-893/PR-2215/OTP-15785' into maint-21 * ingela/ssl/backported-ssl-enhancments/ERL-929/ERL-893/PR-2215/OTP-15785: ssl: Fix cherry-pick mistakes ssl: Refer documentation of HttpPacket from erts ssl: Update type spec of ssl:suite_to_str/1 ssl: Update function ssl:eccs/1 ssl: Fix type specs of ssl_internal.hrl ssl: Fix type specs of internal handshake functions ssl: Fix dialyzer warnings eldap: Fix dialyzer warnings ssl: Fix missing anchor warning public_key: Accept digest types 'sha1' and 'sha' inet: Document type inet:stat_option() ssl: Changed function specs and ssl.xml ssl: Add missing tuple in shutdown reason
2019-05-06Merge branch 'ingela/ssl/flow-ctrl/ERL-934/OTP-15802' into maint-21Erlang/OTP
* ingela/ssl/flow-ctrl/ERL-934/OTP-15802: ssl: Add check when to toggle internal active N
2019-05-06Merge branch 'rickard/ei-nodename/OTP-15781' into maint-21Erlang/OTP
* rickard/ei-nodename/OTP-15781: Increase max number of node name characters to 256
2019-05-06Merge branch 'sverker/process_info-reductions-fix/OTP-15793' into maintSverker Eriksson
* sverker/process_info-reductions-fix/OTP-15793: erts: Force process_info(reductions) as signal erts: Fix another bug in process_info(reductions)
2019-05-06Merge branch 'ingela/ssl/flow-ctrl/ERL-934/OTP-15802' into maintIngela Anderton Andin
* ingela/ssl/flow-ctrl/ERL-934/OTP-15802: ssl: Add check when to toggle internal active N
2019-05-06ssl: Add check when to toggle internal active NIngela Anderton Andin
Missing check of size of user_data_buffer made internal socket behave as an active socket instead of active N. Also correct indentation.
2019-05-06Merge branch 'rickard/ei-nodename/OTP-15781' into maintRickard Green
* rickard/ei-nodename/OTP-15781: Increase max number of node name characters to 256
2019-05-06Merge branch 'raimo/stdlib/gen_statem-sync-timer-cancel/OTP-15295' into maintRaimo Niskanen
* raimo/stdlib/gen_statem-sync-timer-cancel/OTP-15295: Rewrite to use synchronous timer cancel
2019-05-06Merge branch 'siri/ct/fuzzer_support/ERIERL-143/OTP-14746' into maintSiri Hansen
2019-05-06[ct] Remove deprecated call to erlang:get_stacktrace()Siri Hansen
2019-05-03erts: Force process_info(reductions) as signalSverker Eriksson
Not 100% sure this is needed to get correct reductions as the direct query is not done if process is RUNNING anyway.
2019-04-30Merge branch ↵Ingela Anderton Andin
'ingela/ssl/backported-ssl-enhancments/ERL-929/ERL-893/PR-2215/OTP-15785' into maint
2019-04-30Increase max number of node name characters to 256Rickard Green
2019-04-30ssl: Fix cherry-pick mistakesIngela Anderton Andin
2019-04-30ssl: Refer documentation of HttpPacket from ertsPéter Dimitrov
Do not document http_packet() in ssl but refer to description of erlang:decode_packet/3. Change-Id: Ib2d0e4fc9605e40fe98bb249bc17fc39046d137a Conflicts: lib/ssl/src/ssl.erl
2019-04-30ssl: Update type spec of ssl:suite_to_str/1Péter Dimitrov
Change-Id: I7987e80cca7af184a9f40cdcd8ea8f07c318ba0d
2019-04-30ssl: Update function ssl:eccs/1Péter Dimitrov
Remove support of version tuples (e.g. {3,3}) from API function ssl:eccs/1. Update function spec and documentation. Change-Id: I891e42a2ca31c3e06b4edeeb866c0df874f2035b Conflicts: lib/ssl/doc/src/ssl.xml lib/ssl/src/ssl.erl
2019-04-30ssl: Fix type specs of ssl_internal.hrlPéter Dimitrov
Change 'term()' to 'any()'. Allow 'undefined' for all fields of #ssl_options{}. Change-Id: I00632bfd2b172974a99680a82f326f25b92b9974 Conflicts: lib/ssl/src/ssl_internal.hrl
2019-04-30ssl: Fix type specs of internal handshake functionsPéter Dimitrov
Change-Id: I99cd0bebd80b3e55fd522457fa126e5bc198657b Conflicts: lib/ssl/src/ssl_handshake.erl
2019-04-30ssl: Fix dialyzer warningsPéter Dimitrov
Change-Id: Ic4895195569073916f158a06b95061939f15cfc0 Conflicts: lib/ssl/doc/src/ssl.xml lib/ssl/src/ssl.erl
2019-04-30eldap: Fix dialyzer warningsPéter Dimitrov
Change-Id: I4874f18bd1396f6efc0fe6e3efe791f2dae56243
2019-04-30ssl: Fix missing anchor warningPéter Dimitrov
Change-Id: Iafbf60765b4635d6a50286080716c67231bb5cd9
2019-04-30public_key: Accept digest types 'sha1' and 'sha'Péter Dimitrov
Update type spec for digest_type() to reflect that functions with this type accept the (wrong) atom 'sha1'. The right behavior would be to only accept 'sha' as that is the only valid value of crypto:sha1(). Update rsa_digest_oid/1 and ecdsa_digest_oid/1 to accept digest 'sha'. Change-Id: I03219396b797435298e098e03b93286b352e07e2
2019-04-30inet: Document type inet:stat_option()Péter Dimitrov
Document type inet:stat_option() to resolve missing anchor warnings when this type is referenced in other applications. Change-Id: Ifbf775c2f67b48bcf7d0cf21c39065d3dacc4f55
2019-04-30ssl: Changed function specs and ssl.xmlKenneth Lundin
Changed function specs and ssl.xml for generation of documentation according to the new way. Change-Id: I17b59b80f9072c3d2c20aea1b102f1e9c86987a0 Conflicts: lib/ssl/doc/src/ssl.xml lib/ssl/src/ssl.erl
2019-04-30 ssl: Add missing tuple in shutdown reasonIngela Anderton Andin
2019-04-26Merge branch 'maint-21' into maintHans Nilsson
* maint-21: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
2019-04-24erts: Fix another bug in process_info(reductions)Sverker Eriksson
to disregard consumed virtual reductions which are not aggregated into p->reds and if included may cause reduction count go backwards.
2019-04-24Updated OTP versionOTP-21.3.7Erlang/OTP
2019-04-24Prepare releaseErlang/OTP
2019-04-24Merge branch 'hans/ssh/hex_dump_info/OTP-15772' into maint-21Erlang/OTP
* hans/ssh/hex_dump_info/OTP-15772: ssh: Dump 64 bytes in case of unexpected info line ssh: Add hexdump utility in ssh_dbg
2019-04-24Merge branch 'hans/ssh/hex_dump_info/OTP-15772' into maintHans Nilsson
* hans/ssh/hex_dump_info/OTP-15772: ssh: Dump 64 bytes in case of unexpected info line ssh: Add hexdump utility in ssh_dbg
2019-04-18ssh: Dump 64 bytes in case of unexpected info lineHans Nilsson
2019-04-18ssh: Add hexdump utility in ssh_dbgHans Nilsson
2019-04-18Merge branch 'maint-21' into maintRaimo Niskanen
* maint-21: Updated OTP version Prepare release Conflicts: make/otp_version_tickets
2019-04-18Bump otp_patch_solve_forward_merge_versionRaimo Niskanen
2019-04-18Merge branch 'raimo/ssl/beast-mitigation-hickup/ERIERL-346/OTP-15054' into maintRaimo Niskanen
* raimo/ssl/beast-mitigation-hickup/ERIERL-346/OTP-15054: Do not create empty binaries when splitting iovec
2019-04-17Updated OTP versionOTP-21.3.6Erlang/OTP
2019-04-17Prepare releaseErlang/OTP
2019-04-17Merge branch 'raimo/ssl/beast-mitigation-hickup/ERIERL-346/OTP-15054' into ↵Erlang/OTP
maint-21 * raimo/ssl/beast-mitigation-hickup/ERIERL-346/OTP-15054: Do not create empty binaries when splitting iovec
2019-04-17Rewrite to use synchronous timer cancelRaimo Niskanen
2019-04-17Do not create empty binaries when splitting iovecRaimo Niskanen