aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-09-16Merge branch 'ia/ssl/downgrade/alert_timout/OTP-11397/OTP-12832' into maintIngela Anderton Andin
* ia/ssl/downgrade/alert_timout/OTP-11397/OTP-12832: ssl: Better timeout gaurds ssl: Improve shutdown logic
2015-09-16ssl: Better timeout gaurdsIngela Anderton Andin
2015-09-16ssl: Improve shutdown logicIngela Anderton Andin
Add possibility to downgrade an SSL/TLS connection to a tcp connection, and give back the socket control to a user process. Add application setting to be able to change fatal alert shutdown timeout, also shorten the default timeout. The fatal alert timeout is the number of milliseconds between sending of a fatal alert and closing the connection. Waiting a little while improves the peers chances to properly receiving the alert so it may shutdown gracefully.
2015-09-15Merge branch 'ia/pr/800/OTP-12984' into maintIngela Anderton Andin
* ia/pr/800/OTP-12984: inets: Forward connection errors with https proxy
2015-09-14Merge branch 'anders/diameter/18.1/OTP-12978' into maintAnders Svensson
* anders/diameter/18.1/OTP-12978: Update appup for 18.1
2015-09-14Merge branch 'anders/diameter/watchdog/OTP-12969' into maintAnders Svensson
* anders/diameter/watchdog/OTP-12969: Fix watchdog function_clause
2015-09-14Merge branch 'anders/diameter/M-bit/OTP-12947' into maintAnders Svensson
* anders/diameter/M-bit/OTP-12947: Add service_opt() strict_mbit
2015-09-14Merge branch 'hans/ssh/increase_max_num_algos' into maintHans Nilsson
2015-09-14Merge branch 'bjorn/cuddle-with-tests' into maintBjörn Gustavsson
* bjorn/cuddle-with-tests: (23 commits) rand_SUITE: Speed up basic_stats/1 base64_SUITE: Speed up roundtrip/1 lists_SUITE: Test lists:concat/2 lists_SUITE: Test lists:split/2 lists_SUITE: Add a test case for lists:prefix/2 lists_SUITE: Add hof/1 to test all high-order functions lists_SUITE: Add test for lists:takewhile/1 lists_SUITE: Run test cases in each group in parallel lists_SUITE: Test lists:keyreplace/4 lists_SUITE: Extend flatten/1 test to also test flatlength/1 lists_SUITE: Correct test of lists:flatten/2 id_transform_SUITE: Modernize test suite io_proto_SUITE: Speed up determination of default shell io_proto_SUITE: Refactor up rtnode() and friends gen_event_SUITE: Remove unnecessary sleep calls proc_lib: Improve coverage for crash/1 proc_lib_SUITE: Eliminate compiler warnings io_SUITE: Add coverage/1 to completely cover io_lib_pretty io_SUITE: Extend coverage of code for testing printable chars io_SUITE: Speed up test for bad +pc option ...
2015-09-11rand_SUITE: Speed up basic_stats/1Björn Gustavsson
Refactor basic_stats/1 into three separate test cases that can be run in parallel.
2015-09-11base64_SUITE: Speed up roundtrip/1Björn Gustavsson
Refactor roundtrip/1 into 4 test cases that can be run in parallel. Assuming that there are 4 cores available, the group of 4 test cases will run at roughly one fourth of the time for the original test case.
2015-09-11lists_SUITE: Test lists:concat/2Björn Gustavsson
2015-09-11lists_SUITE: Test lists:split/2Björn Gustavsson
2015-09-11lists_SUITE: Add a test case for lists:prefix/2Björn Gustavsson
2015-09-11lists_SUITE: Add hof/1 to test all high-order functionsBjörn Gustavsson
2015-09-11lists_SUITE: Add test for lists:takewhile/1Björn Gustavsson
2015-09-11lists_SUITE: Run test cases in each group in parallelBjörn Gustavsson
On my computer, this will shave off more than one second of the runnning time and about 4 seconds when cover is being run.
2015-09-11lists_SUITE: Test lists:keyreplace/4Björn Gustavsson
2015-09-11lists_SUITE: Extend flatten/1 test to also test flatlength/1Björn Gustavsson
2015-09-11lists_SUITE: Correct test of lists:flatten/2Björn Gustavsson
The test that was supposed to call lists:flatten/2 called lists:flatten/1!
2015-09-11id_transform_SUITE: Modernize test suiteBjörn Gustavsson
Remove handling of Clearcase; remove ?line macros.
2015-09-11io_proto_SUITE: Speed up determination of default shellBjörn Gustavsson
Use getline_pred action that fails fast if the shell is not the oldshell, to avoid having to wait for the timeout.
2015-09-11io_proto_SUITE: Refactor up rtnode() and friendsBjörn Gustavsson
Introduce a new {getline_pred, Fun, Msg} action that is useful in itself, but can also be used to share more code for {getline, Match} and {getline_re, Match}. Also get rid of the ?line macros in rtnode() so that we can somewhat reduce the ridculous indentation level.
2015-09-11gen_event_SUITE: Remove unnecessary sleep callsBjörn Gustavsson
The calls to test_server:sleep/1 are unnecessary as the swapping of handlers happens in a single process. Even though the {swap_info,...} message is sent asynchronously, the gen_event:which_handlers/1 call will not have a chance to execute until the handlers have been swapped.
2015-09-11proc_lib: Improve coverage for crash/1Björn Gustavsson
First refactor the entire test case using helper functions to facilitate further maintenance. Then test that proc_lib can handle that the process dictionary has been erased (that will cover more code in proc_lib). We can also shave off 2 seconds of the execution time by testing the 'shutdown' exit reasons at beginning of the test case instead of doing it at the end.
2015-09-11proc_lib_SUITE: Eliminate compiler warningsBjörn Gustavsson
Use error/1 instead of forcing a badmatch.
2015-09-11io_SUITE: Add coverage/1 to completely cover io_lib_prettyBjörn Gustavsson
2015-09-11io_SUITE: Extend coverage of code for testing printable charsBjörn Gustavsson
2015-09-11io_SUITE: Speed up test for bad +pc optionBjörn Gustavsson
Move the test for a bad +pc option to its own test case for cleanliness. Use the os:cmd/1 function to avoid the annyoying 30 seconds time-out in test_server:start_node/3.
2015-09-11io_SUITE: Add test for printing of mapsBjörn Gustavsson
2015-09-11ssh: increased max number of algorithmsHans Nilsson
2015-09-11Merge branch 'siri/doc-gen_fsm-reply-return/OTP-12973' into maintSiri Hansen
* siri/doc-gen_fsm-reply-return/OTP-12973: Fix doc for return value of gen_fsm:reply/2
2015-09-11Merge branch 'mururu/fix-cover-output-file' into maintSiri Hansen
* mururu/fix-cover-output-file: Add test for "Fix cover output file" Fix cover output file OTP-12981
2015-09-11Merge branch 'c-rack/fix-typo3' into maintZandra
* c-rack/fix-typo3: Fix typo in call_last/3 spec Fix typo Fix typo: message to send is in x(1) not x(0) Fix another small typo Fix typo
2015-09-11Merge branch 'mururu/fix-public_key-doc' into maintZandra
* mururu/fix-public_key-doc: Fix public_key doc
2015-09-11Fix public_key docYuki Ito
2015-09-10Merge branch 'ia/inets/format_status/OTP-12976' into maintIngela Anderton Andin
* ia/inets/format_status/OTP-12976: inets: httpd - Add format_status/2 to httpd_request_handler
2015-09-10Merge branch 'sverk/inet-packet-ssl_tls-passive' into maintSverker Eriksson
* sverk/inet-packet-ssl_tls-passive: erts: Fix inet packet mode ssl_tls for passive mode
2015-09-10Update appup for 18.1Anders Svensson
OTP-12947 strict_mbit service_opt() OTP-12969 diameter_watchdog function_clause No load order requirements.
2015-09-10Merge branch 'howleysv/stdlib/compiled-unicode/OTP-12977' into maintBjörn Gustavsson
* howleysv/stdlib/compiled-unicode/OTP-12977: stdlib: Fix bug with unicode detection in re
2015-09-10Merge branch 'ia/pr/813/OTP-12975' into maintIngela Anderton Andin
* ia/pr/813/OTP-12975: Correct conversion from seconds to milliseconds
2015-09-10Merge branch 'ia/pr/801/OTP-12974' into maintIngela Anderton Andin
* ia/pr/801/OTP-12974: Accept 'ECPrivateKey' as a ssl key option
2015-09-10Fix doc for return value of gen_fsm:reply/2Siri Hansen
2015-09-10Add test for "Fix cover output file"Siri Hansen
If a module includes eunit.hrl, a parse transform adds the function test/0 on line 0 in the module. A bug in OTP-18.0 caused cover:analyse_to_file/1 to fail to insert cover data in the output file when line 0 existed in the cover data table. The bug is corrected by the commit "Fix cover output file". This commit adds a test which checks that the bug is not introduced again.
2015-09-10io_SUITE: Eliminate warnings for unused variablesBjörn Gustavsson
2015-09-10compile_SUITE: Add test of warningsBjörn Gustavsson
Make sure that all warnings produced when compiling the test suite contains filenames and line numbers.
2015-09-10Merge branch 'ia/tmanevik_inets/doc' into maintIngela Anderton Andin
* ia/tmanevik_inets/doc: inets: Fix broken links inets: Fix copy paste error inets: ftp - Remove information about alternative solutions inets: httpd - Add links and small corrections inets: httpc - Clarify/correct documentation inets: Align with alphabetical order and clean local anchor handling inets: ftp - add links and fix typos inets: Use ASSCI ' Inets Reference Manual Inets User Guide inets: sorted functions alphabetically inets: Remove documentation of legacy API
2015-09-10Merge branch 'ia/inets/httpd/tftpd/fd/OTP-12875/OTP-12898' into maintIngela Anderton Andin
* ia/inets/httpd/tftpd/fd/OTP-12875/OTP-12898: inets: Add test suite for socket_wrap feature inets: Ctify inets_SUITE inets: tftpd - Mend broken fd option inets: httpd - Mend broken fd option
2015-09-10inets: Add test suite for socket_wrap featureIngela Anderton Andin
On Linux systems a socket may be opened pre starting Erlang and then passed to Erlangs ftpd or httpd daemon. This is useful as the wrap program can open a privileged port and Erlang does not have to be run as root. The test program will only open a random port, but it exercises the code so that the feature will remain intact.
2015-09-10inets: Ctify inets_SUITEIngela Anderton Andin
Also remove all form of io:formats that can easily be achieved by tracing.