aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2019-06-10Merge branch 'ingela/ssl/dtls-multiplxor/ERL-962/OTP-15864' into maintIngela Anderton Andin
* ingela/ssl/dtls-multiplxor/ERL-962/OTP-15864: ssl: Add missing gen_server return value in DTLS packet demux process
2019-06-10Testing two PRsHans Nilsson
Merge commit '508ddd5aaa189ddcf7a06f4342c187b07ec1734a'; commit '5160870a868bfcb29bd8f1a2c12b7b7b7963d946' into hans/ssh/PRs * commit '508ddd5aaa189ddcf7a06f4342c187b07ec1734a': Remove duplication of SSH encoding macros * commit '5160870a868bfcb29bd8f1a2c12b7b7b7963d946': Remove duplicate ssh_userauth.hrl
2019-06-08specs_gen script fix error messagelarry
The warning message was using input file, not output file: Example: could not write file '../src/alarm_handler.erl': no such file or directory Which is the input file, the correct message is: could not write file '../specs/alarm_handler.specs': no such file or directory
2019-06-07Fix SSL cb_info missing underscore in defaultMatt Ludwigs
2019-06-07ssl: Add missing gen_server return value in DTLS packet demux processIngela Anderton Andin
2019-06-07Correct type spec for gen_sctp:connect/4,5Raimo Niskanen
2019-06-07[snmp|test] Use system monitor to discover slow VM issuesMicael Karlberg
We have experienced intermittent failures of random test cases on slow VMs. In order to get more info about the system, we use system monitor to collect info. We have one global monitor system, and one local monitor on each node. Each local monitor report to the global, which in turn prints a message.
2019-06-07ssl: Update standards compliancePéter Dimitrov
2019-06-07ssl: Fix alert handling (TLS 1.3)Péter Dimitrov
Server and client use different secrets when sending certificate related alerts. This is due to a change to the TLS protocol where clients send their 'certificate' message after they have received the server's 'finished' message.
2019-06-07ssl: Add tests for ALPN in TLS 1.3Péter Dimitrov
2019-06-07ssl: Implement ALPN in TLS 1.3Péter Dimitrov
2019-06-07ssl: Add TLS 1.3 test group to ssl_certificate_verify_SUITEPéter Dimitrov
2019-06-07ssl: Fix negative tests in ssl_basic_SUITEPéter Dimitrov
2019-06-07cerl: Fix spelling error in a case of ctype()Kostis Sagonas
2019-06-06Remove duplication of SSH encoding macrosPaul Meinhardt
2019-06-06Remove duplicate ssh_userauth.hrlPaul Meinhardt
The `ssh_userauth.hrl` header file was a duplicate of `ssh_auth.hrl` not used anywhere except for the ssh benchmark suite.
2019-06-05Let pre-push hook detect when it needs an upgradeSverker Eriksson
after a master release.
2019-06-05Merge branch 'maint'Siri Hansen
2019-06-05Merge branch 'siri/logger/relatve-log-file-path/OTP-15850' into maintSiri Hansen
* siri/logger/relatve-log-file-path/OTP-15850: [logger] Store file name as absolute path in logger_std_h
2019-06-05Merge branch 'maint'Hans Bolinder
* maint: dialyzer: Correct indentation of field warnings
2019-06-05Merge branch 'hasse/dialyzer/fix_string_split/OTP-15861/ERL-953' into maintHans Bolinder
* hasse/dialyzer/fix_string_split/OTP-15861/ERL-953: dialyzer: Correct indentation of field warnings
2019-06-05Merge branch 'maint'Ingela Anderton Andin
2019-06-05Merge branch 'ingela/ssl/ret-ext/ERL-951/OTP-15862' into maintIngela Anderton Andin
* ingela/ssl/ret-ext/ERL-951/OTP-15862: ssl: Fix broken return value
2019-06-05ssl: Fix broken return valueIngela Anderton Andin
2019-06-05[ct] Fix bug where Hook:terminate/1 was called before Hook:init/2Siri Hansen
This problem was introduced with commit acd87425acf7705328b01aa8f0a804207ffe4790, when the new hook function post_groups/2 and post_all/3 were added.
2019-06-04erts: Fix SEGV crash on shell break (p)roc infoSverker Eriksson
esdp==NULL if run by non scheduler thread.
2019-06-04Merge branch 'maint'Ingela Anderton Andin
2019-06-04Merge branch 'ingela/ssl/22/alert-strings/OTP-15844' into maintIngela Anderton Andin
* ingela/ssl/22/alert-strings/OTP-15844: ssl: Returned "alert error string" should be same as logged alert string
2019-06-04ssl: Returned "alert error string" should be same as logged alert stringIngela Anderton Andin
2019-06-04erts: Fix {active,N} close race condition on windowsLukas Larsson
When a close is detected on windows, we need to keep track of it as it will not trigger again.
2019-06-04Revert "erts: Force process_info(reductions) as signal"Sverker Eriksson
This reverts commit 70dbf671a8196110d2aee2e7507afc2c2c75183f. As the comment of 70dbf671a8 itself indicates, that "fix" is not really necessary. It has, however, the bad effect of always consuming reductions of the process you want to know reduction from, that is you can't meassure reduction count without affecting it.
2019-06-04Merge branch 'maint'Ingela Anderton Andin
2019-06-04Merge branch 'ingela/ssl/PR-2235/OTP-15851' into maintIngela Anderton Andin
* ingela/ssl/PR-2235/OTP-15851: Export sign_scheme/0 types
2019-06-04Merge branch 'maint'Ingela Anderton Andin
2019-06-04Merge pull request #2268 from IngelaAndin/ingela/ssl/DTLS-version-check/ERL-920Ingela Andin
ssl: Change check of DTLS record version OTP-15807 Merged as it is an confirmed improvement, however more work needs to be done on DTLS test framework.
2019-06-04[ct] Fix bug where Hook:terminate/1 was called before Hook:init/2Siri Hansen
This problem was introduced with commit acd87425acf7705328b01aa8f0a804207ffe4790, when the new hook function post_groups/2 and post_all/3 were added.
2019-06-04dialyzer: Correct indentation of field warningsHans Bolinder
See also https://bugs.erlang.org/browse/ERL-953.
2019-06-04Merge branch 'maint'Ingela Anderton Andin
2019-06-04Merge pull request #2269 from IngelaAndin/ingela/ssl/ret-ext/ERL-951Ingela Andin
ssl: Fix broken return value OTP-15862
2019-06-04[esock] Add pattern to socket descriptorMicael Karlberg
Add a pattern field to the (beginning of the) socket descriptor. To make it more easy to spot memory over-writes. One pattern for create and one for dtor. Also reset various fields of the descriptor at dtor.
2019-06-04[esock] Post rebase cleanupMicael Karlberg
Rebase (on maint as of 20190529) resulted in a number of issues. Mostly in the (esock) test suite. OTP-15731
2019-06-04Merge branch 'maint'Ingela Anderton Andin
* maint: Updated OTP version Prepare release
2019-06-04Merge branch 'maint-21' into maintIngela Anderton Andin
* maint-21: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/kernel/doc/src/notes.xml # lib/kernel/src/kernel.appup.src # lib/kernel/vsn.mk # lib/ssl/doc/src/notes.xml # lib/ssl/vsn.mk # lib/stdlib/doc/src/notes.xml # lib/stdlib/src/stdlib.appup.src # lib/stdlib/vsn.mk # make/otp_version_tickets # otp_versions.table
2019-06-03alt_dist docs: Correct the mf_getstat descriptionLoïc Hoguin
2019-06-03Return real pend value in erlang:dist_get_stat/1Loïc Hoguin
Only the dist_util code is using this function and it already is compatible with a non-boolean value.
2019-06-03Merge branch 'maint'Hans Bolinder
* maint: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # make/otp_version_tickets_in_merge
2019-06-03Merge branch 'maint-22' into maintHans Bolinder
* maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
2019-06-03Merge branch 'maint'Björn Gustavsson
* maint: Teach ei_print_term() to print funs Teach ei_print_term() to print maps Correct decoding of old funs (FUN_EXT) Correct decoding of external funs
2019-06-03Updated OTP versionOTP-21.3.8.3Erlang/OTP
2019-06-03Prepare releaseErlang/OTP