aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-03-08Merge branch 'maint'Ingela Anderton Andin
2017-03-08Merge branch 'ingela/ssl/next-maint-version' into maintIngela Anderton Andin
* ingela/ssl/next-maint-version: ssl: Version update
2017-03-08Merge branch 'ingela/ssl/dtls-cont' into maintIngela Anderton Andin
* ingela/ssl/dtls-cont: dtls: Only test this for TLS for now dtls: Avoid mixup of protocol to test dtls: 'dtlsv1.2' corresponds to 'tlsv1.2' dtls: Correct dialyzer spec and postpone inclusion of test dtls: Erlang distribution over DTLS is not supported dtls: Enable some DTLS tests in ssl_to_openssl_SUITE dtls: Enable DTLS test in ssl_certificate_verify_SUITE dtls: Hibernation and retransmit timers dtls: Make sure retransmission timers are run dtls: DTLS specific handling of socket and ciphers
2017-03-08dtls: Only test this for TLS for nowIngela Anderton Andin
We want to avoid failing test cases but still be able to merge DTLS progress for 19.3
2017-03-08Merge branch 'maint'Björn Gustavsson
* maint: Travis CI: Avoid that builds gets killed for inactivity
2017-03-08Merge pull request #1366 from bjorng/bjorn/travis/print-progress-dotsBjörn Gustavsson
Travis CI: Avoid that builds gets killed for inactivity
2017-03-07erts: Fix xml lint warning for erl_nifSverker Eriksson
2017-03-07dtls: Avoid mixup of protocol to testIngela Anderton Andin
2017-03-07Merge branch 'maint'Lars Thorsen
2017-03-07Merge branch 'lars/xmerl/compiler_and_dialyzer_warnings/OTP-14212' into maintLars Thorsen
* lars/xmerl/compiler_and_dialyzer_warnings/OTP-14212: [xmerl] Fix compiler and dialyzer warnings
2017-03-07[xmerl] Fix compiler and dialyzer warningsLars Thorsen
2017-03-07dtls: 'dtlsv1.2' corresponds to 'tlsv1.2'Ingela Anderton Andin
'dtlsv1.2' should not be included in MIN_DATAGRAM_SUPPORTED_VERSIONS as this is the default when crypto does not have sufficient support for 'tlsv1.2' and 'dtlsv1.2'
2017-03-07Travis CI: Avoid that builds gets killed for inactivityBjörn Gustavsson
Travis CI will kill build jobs that have not produced output for 10 minutes. The OTP build was never killed because of inactivity before 74796de9c7739 (which started to capture the output in a temporary file). After that commit, now and then a build would be killed because it did not finish in 10 minutes. Update the build script to periodically print a ".", but only if the size of the log file has changed. That way, if there is a real hanging during the build, Travis CI will still kill the build. Alternatives considered: Using travis_wait. Rejected because travis_wait will extend the build unconditonally, even if the build does not progress at all.
2017-03-06Merge branch 'maint'Sverker Eriksson
2017-03-06Merge branch 'sverker/zlib-option-8/ERL-362/OTP-14254' into maintSverker Eriksson
AGAIN * sverker/zlib-option-8/ERL-362/OTP-14254: erts: Fix typo and clearify warning in zlib docs
2017-03-06erts: Fix typo and clearify warning in zlib docsSverker Eriksson
2017-03-06dtls: Correct dialyzer spec and postpone inclusion of testIngela Anderton Andin
The new_options_in_accept test is not working yet, however DTLS is still work in progress and we want to make a progress merge to avoid merge conflicts with other progress of the ssl application.
2017-03-06Merge branch 'maint'Hans Bolinder
* maint: dialyzer: Improve a warning dialyzer: Fix a weird warning dialyzer: Fix an opaque bug dialyzer: Minor fix Conflicts: lib/dialyzer/src/dialyzer_dataflow.erl
2017-03-06Merge branch 'hasse/dialyzer/fix_warnings/OTP-14177' into maintHans Bolinder
* hasse/dialyzer/fix_warnings/OTP-14177: dialyzer: Improve a warning dialyzer: Fix a weird warning dialyzer: Fix an opaque bug dialyzer: Minor fix
2017-03-06Merge branch 'maint'Raimo Niskanen
2017-03-06Merge branch 'maint-r14' into maintRaimo Niskanen
2017-03-06Merge branch 'maint-r13' into maintRaimo Niskanen
2017-03-06Merge branch 'maint'Sverker Eriksson
2017-03-06Merge branch 'sverker/zlib-option-8/ERL-362/OTP-14254' into maintSverker Eriksson
2017-03-06Merge branch 'maint'Lukas Larsson
2017-03-06Merge branch 'lukas/erts/19.3-doc-fixes' into maintLukas Larsson
* lukas/erts/19.3-doc-fixes: erts: Clarify process_info(pid(), binary) docs
2017-03-06dtls: Erlang distribution over DTLS is not supportedIngela Anderton Andin
Erlang distribution requiers a reliable transport, which udp is not. Maybe could be interesting later when SCTP support is added to DTLS.
2017-03-06dtls: Enable some DTLS tests in ssl_to_openssl_SUITEIngela Anderton Andin
We need to figure out a good way of knowing if the OpenSSL-"DTLS server" is up. Some of the code in this commit is attempting this, but it is not really working yet, and hence only tests where OpenSSL is client are enabled.
2017-03-06dtls: Enable DTLS test in ssl_certificate_verify_SUITEIngela Anderton Andin
2017-03-06dtls: Hibernation and retransmit timersIngela Anderton Andin
Change retransmissions timers to use gen_statem state timeouts. We do not need a retransmission timer in the state connection as data traffic in DTLS over UDP is not retransmitted. If the last flight before transitioning into connection is lost, it will be resent when the peer resends its last flight. This will also make hibernation testing more straight forward. We need more adjustments later to handle a reliable DTLS transport such as SCTP.
2017-03-06dtls: Make sure retransmission timers are runIngela Anderton Andin
2017-03-06dtls: DTLS specific handling of socket and ciphersIngela Anderton Andin
DTLS does not support stream ciphers and needs diffrent handling of the "#ssl_socket{}" handle .
2017-03-06Merge branch 'maint'Peter Andersson
2017-03-06Merge pull request #1313 from expelledboy/maintBjörn Gustavsson
tools: Allow Emake options to be passed in explicitly OTP-14253
2017-03-06Merge branch 'peppe/common_test/multiply_timetraps/OTP-14210' into maintPeter Andersson
* peppe/common_test/multiply_timetraps/OTP-14210: Fix multiply/scale_timetraps in testspecs not working OTP-14210
2017-03-06Merge branch 'maint'Siri Hansen
2017-03-06Merge branch 'siri/ct_hooks/callbacks-on-skip/OTP-10599' into maintSiri Hansen
* siri/ct_hooks/callbacks-on-skip/OTP-10599: [ct] Update built-in ct hooks with new Suite parameter [cth_surefire] Handle skips from test spec [ct] Remove excessive skipped/failed tag in hook function [ct] Send tc_start event on force_stop and failed sequence [ct] Correctly handle process died in init and end_per_testcase [ct] Fix faulty hook callbacks for skipped tests Add dummy end_per_suite/1 [ct] Fix hooks and fail when one of init/end_per_* does not exit [ct] Add Suite argument to hook callback functions [ct] Fix function_clause in ct_framework when hook function crashes
2017-03-03Merge branch 'maint'Björn Gustavsson
* maint: tools: Use portable lookup of home directory dialyzer, observer: Use portable lookup of home directory
2017-03-03Merge pull request #1361 from bjorng/bjorn/home-directory/ERL-161/OTP-14249Björn Gustavsson
Use a portable way to lookup the home directory
2017-03-03Merge branch 'maint'Raimo Niskanen
2017-03-03Merge pull request #1359 from myronmarston/fix-length-typoBjörn Gustavsson
Fix typos: lenght -> length
2017-03-03Merge branch 'raimo/kernel/gen_statem-progress/OTP-14114' into maintRaimo Niskanen
* raimo/kernel/gen_statem-progress/OTP-14114: Make code_change/4 optional Implement fallback for terminate/3 Clarify code_change and callback mode change Stop pampering with stacktraces Clean up timer handling Remove event timer optimization Clean up timer handling Reduce number of loop variables hence code mass Optimize by using async cancel_timer Bugfix: callback mode not cached after code change Implement repeat_state and repeat_state_and_data Correct type checking function for action {next_event,,} Change arity of type to init_result/1
2017-03-03Merge branch 'egil/erts/sub-binary-to-heap-binary/OTP-14149'Björn-Egil Dahlberg
* egil/erts/sub-binary-to-heap-binary/OTP-14149: observer: Fix crashdump viewer testcase erts: Refactor MOVE_CONS to inline function erts: Refactor MOVE_BOXED to inline function erts: Convert small sub-binaries to heap-binaries
2017-03-03erts: Clarify process_info(pid(), binary) docsLukas Larsson
Correct id for 7b419c0a38bd4db: OTP-14234
2017-03-03tools: Allow Emake options to be passed in explicitlyAnthony Jackson
This allows build scripts to use emake without needing to generate an Emakefile before running make:all/0,1 or make:file/1,2.
2017-03-03Merge branch 'maint'Lukas Larsson
2017-03-03Merge branch 'lukas/erts/configure_option_to_threadnames/OTP-14232' into maintLukas Larsson
* lukas/erts/configure_option_to_threadnames/OTP-14232: erts: Add configure option for setting threadnames
2017-03-02tools: Use portable lookup of home directoryBjörn Gustavsson
In the xref example, use init:get_argument(home) to find the location of the home directory.
2017-03-02dialyzer, observer: Use portable lookup of home directoryBjörn Gustavsson
Use init:get_argument(home) to find the location of the home directory. That will work on all platforms (including Windows). Note that the run-time system will fail to start if HOME (or the equivalent on Windows) is not set. Therefore, it can be assumed that init:get_argument(home) will not fail. ERL-161
2017-03-02Merge branch 'maint'Hans Bolinder
* maint: typer: Update runtime dependencies dialyzer: Update runtime dependencies Correct documentation of get_modules message