aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-08-22Merge branch 'maint'Ingela Anderton Andin
Conflicts: lib/ssl/src/ssl_cipher.erl
2018-08-22Merge branch 'ingela/ssl/clean' into maintIngela Anderton Andin
* ingela/ssl/clean: ssl: Move formatting code to own module ssl: Remove legacy files
2018-08-21ssl: Move formatting code to own moduleIngela Anderton Andin
The conversion code for different representations of cipher suites is long an repetitive. We want to hide it in a module that does not have other functions that we like to look at.
2018-08-21Merge branch 'rickard/crypto-configure/OTP-15129'Rickard Green
* rickard/crypto-configure/OTP-15129: Move configuration of crypto to crypto application from erts
2018-08-21Merge branch 'rickard/parallel-configure/OTP-14625'Rickard Green
* rickard/parallel-configure/OTP-14625: Parallel configure Remove undocumented and unused lazy configure
2018-08-21Move configuration of crypto to crypto application from ertsRickard Green
In order to be able to handle runtime library path in crypto also DED parts was broken out into a macro.
2018-08-21Parallel configureRickard Green
2018-08-21ssl: Remove legacy filesIngela Anderton Andin
When starting to implement DTLS, it was assumed that the APIs for TLS and DTLS would differ more. This assumption turned out to be wrong.
2018-08-21Merge branch 'max-au/dist_msg_too_long'Rickard Green
* max-au/dist_msg_too_long: Cleanup unused dist output buf immediately instead of at GC Throw 'system_limit' when distribution message size exceed INT_MAX instead of crashing emulator with 'Absurdly large distribution data buffer'
2018-08-21Cleanup unused dist output buf immediately instead of at GCRickard Green
2018-08-21Merge branch 'maint'Hans Bolinder
* maint: stdlib: Correct contracts in module io_lib_format stdlib: Improve error handling in module io_lib
2018-08-21Merge branch 'hasse/stdlib/io_lib_errhandling/OTP-15076' into maintHans Bolinder
* hasse/stdlib/io_lib_errhandling/OTP-15076: stdlib: Correct contracts in module io_lib_format stdlib: Improve error handling in module io_lib
2018-08-21Merge branch 'maint'Rickard Green
* maint: Fix incoming suspend monitor down
2018-08-21Merge branch 'rickard/fix-suspend-monitor-down/OTP-15237/ERL-704' into maintRickard Green
* rickard/fix-suspend-monitor-down/OTP-15237/ERL-704: Fix incoming suspend monitor down
2018-08-20Merge branch 'maint'Rickard Green
* maint: erts/time_correction.xml: remove extra closing parenthesis use ssl:handshake/1 function
2018-08-20Merge pull request #1934 from marianoguerra/fix-extra-closing-parenthesisRickard Green
erts/time_correction.xml: remove extra closing parenthesis
2018-08-20stdlib: Correct contracts in module io_lib_formatHans Bolinder
2018-08-20stdlib: Improve error handling in module io_libHans Bolinder
2018-08-20Fix incoming suspend monitor downRickard Green
An incoming suspend monitor down wasn't handled correct when the local monitor half had been removed with an emulator crash as result.
2018-08-20Merge pull request #1901 from getong/fix_ssl_exampleIngela Andin
Modernized example
2018-08-17Merge branch 'maint'Hans Nilsson
* maint: ssh: Use the 'macs' tag in crypto:supports/0 ssh: Use the new crypto:supports/0 tag 'curves' crypto: Try to generate ecdh for all crypto:curves() crypto: Put curve list in C
2018-08-17Merge branch 'hans/ssh/curve_element/OTP-15244' into maintHans Nilsson
* hans/ssh/curve_element/OTP-15244: ssh: Use the 'macs' tag in crypto:supports/0 ssh: Use the new crypto:supports/0 tag 'curves'
2018-08-17Merge branch 'hans/crypto/curve_in_supports/OTP-14717' into maintHans Nilsson
* hans/crypto/curve_in_supports/OTP-14717: crypto: Try to generate ecdh for all crypto:curves() crypto: Put curve list in C
2018-08-16erts/time_correction.xml: remove extra closing parenthesisMariano Guerra
2018-08-16ssh: Use the 'macs' tag in crypto:supports/0Hans Nilsson
2018-08-16ssh: Use the new crypto:supports/0 tag 'curves'Hans Nilsson
2018-08-16crypto: Try to generate ecdh for all crypto:curves()Hans Nilsson
2018-08-16crypto: Put curve list in CHans Nilsson
2018-08-16Merge branch 'maint'Hans Nilsson
* maint: crypto: Fail tests if crypto cannot start
2018-08-16Merge branch 'hans/crypto/cuddle_tests' into maintHans Nilsson
* hans/crypto/cuddle_tests: crypto: Fail tests if crypto cannot start
2018-08-16Merge branch 'maint'Hans Nilsson
* maint: ssh: prolong the timeout in ssh_dbg gen_server calls
2018-08-16Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
2018-08-16Merge remote-tracking branch 'upstream/maint'Dan Gudmundsson
* upstream/maint: Require align Add Erlang alignment regexps
2018-08-16Merge pull request #1728 from davidw/emacs-alignDan Gudmundsson
OTP-15239
2018-08-16Merge branch 'josevalim/jv-sb/PR-1803/OTP-15238' into masterLukas Larsson
Optimize binary match from 10% up to 70x
2018-08-16Merge branch 'maint'Lukas Larsson
2018-08-16Merge pull request #1931 from marianoguerra/fix-doc-errors-maintLukas Larsson
fix double parenthesis and badly formatter <v> tags
2018-08-16Merge pull request #1930 from ↵Lukas Larsson
marianoguerra/fix-emd2exml-encoding-value-gen-maint fix generated encoding for xml files generated with emd2exml
2018-08-15fix double parenthesis and badly formatter <v> tagsMariano Guerra
(cherry picked from commit 1b36c8ff81e896f9aa172603962f838d980668a0)
2018-08-15fix generated encoding for xml files generated with emd2exmlMariano Guerra
DTRACE.xml and SYSTEMTRAP.xml set encoding to utf8 instead of utf-8 and make xmerl_scan:file/1,2 fail parsing them (cherry picked from commit faded6e1cdceb049d2d9bc995b6c981d58709315)
2018-08-15ssh: prolong the timeout in ssh_dbg gen_server callsHans Nilsson
2018-08-15crypto: Fail tests if crypto cannot startHans Nilsson
2018-08-15Merge branch 'maint'Björn Gustavsson
* maint: Fix compiler crash when compiling double receives erts: Delete fd from poll-set when closing fd_driver port
2018-08-15Merge pull request #1927 from ↵Björn Gustavsson
bjorng/bjorn/compiler/double-receives/ERL-703/OTP-15235 Fix compiler crash when compiling double receives
2018-08-15merge branch 'lukas/erts/fd_driver-fix_pollset_delete/ERL-692/OTP-15236' ↵Lukas Larsson
into maint erts: Delete fd from poll-set when closing fd_driver port
2018-08-15Merge branch 'maint'Ingela Anderton Andin
2018-08-15Merge branch 'maint-20' into maintIngela Anderton Andin
* maint-20: inets: Remove 21 test case Updated OTP version Update release notes Conflicts: OTP_VERSION lib/inets/doc/src/notes.xml lib/inets/test/httpd_SUITE.erl lib/inets/vsn.mk otp_versions.table
2018-08-15inets: Remove 21 test caseIngela Anderton Andin
A test case unrelated to the patch was accidentally added when backporting the solution.
2018-08-15Merge branch 'maint'Lukas Larsson
2018-08-15Merge branch 'lukas/travis/deploy' into maintLukas Larsson
* lukas/travis/deploy: travis: Make bundle version select regexp stricter
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 22:23:47 +0000