aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-05-07Merge pull request #1802 from michalmuskala/map-is-key-bifBjörn Gustavsson
Introduce is_map_key/2 guard BIF OTP-15037
2018-05-07Merge pull request #1805 from bjorng/bjorn/hipe/remove-unused-modulesBjörn Gustavsson
Remove unused source files in lib/hipe/opt
2018-05-07Merge branch 'john/tools/cuddle-lcnt-tests'John Högberg
* john/tools/cuddle-lcnt-tests: Ensure that lcnt server is terminated after lcnt:stop/0
2018-05-07Ensure that lcnt server is terminated after lcnt:stop/0John Högberg
This makes the nightly tests slightly more stable as they assert that the server isn't alive when lcnt:start/0 is called, which it could still be since the stop command was a plain gen_server call that didn't wait until the termination was completed.
2018-05-04Merge branch 'hans/ssh/rekey_limit/OTP-15069'Hans Nilsson
* hans/ssh/rekey_limit/OTP-15069: ssh: Extend rekey_limit to also take an optional time
2018-05-04ssh: Extend rekey_limit to also take an optional timeHans Nilsson
2018-05-04Remove unused source files in lib/hipe/optBjörn Gustavsson
Three of the removed source files don't even compile. Uncompilable source files cause problems for tools such as scripts/diffable that want to compile all found source files.
2018-05-04scripts/diffable: Include the hipe applicationBjörn Gustavsson
2018-05-04Merge pull request #1766 from seancribbs/add_erl_types_suiteHans Bolinder
Move erl_types test into a common_test suite
2018-05-04Merge branch 'bjorn/fix-typer-link'Björn Gustavsson
* bjorn/fix-typer-link: Fix the missing link to typer in an installed system
2018-05-04Merge branch 'john/kernel/add-file_int-to-release'John Högberg
* john/kernel/add-file_int-to-release: Add file_int.hrl to release target
2018-05-04Merge branch 'john/erts/fix-windows-symlinks/OTP-15062/ERL-615'John Högberg
* john/erts/fix-windows-symlinks/OTP-15062/ERL-615: Stop assuming that all NTFS reparse points are links
2018-05-03Stop assuming that all NTFS reparse points are linksJohn Högberg
This fixes a crash that would occur when using file:read_file_info/1 on a file with a non-link reparse point, which are commonly seen in RSS and OneDrive folders.
2018-05-03Merge branch 'ingela/ssl/testcuddling'Ingela Anderton Andin
* ingela/ssl/testcuddling: ssl: Exclude DTLS tests for one more OpenSSL version for now ssl: Use sane input data ssl: Make sure help function works from all parts of test suite
2018-05-03Merge branch 'lukas/kernel/logger-docs'Lukas Larsson
* lukas/kernel/logger-docs: Add xmllint to travis build kernel: Use formatter in simple logger example
2018-05-03Add xmllint to travis buildLukas Larsson
2018-05-03Merge branch 'maint'John Högberg
* maint: Updated OTP version Update release notes Update version numbers ssl: Prepare for release ssl: Proper handling of clients that choose to send an empty answer to a certificate request heart: Use ntohs instead of manual conversion
2018-05-03Merge branch 'maint-20' into maintJohn Högberg
* maint-20: Updated OTP version Update release notes Update version numbers ssl: Prepare for release ssl: Proper handling of clients that choose to send an empty answer to a certificate request heart: Use ntohs instead of manual conversion
2018-05-02kernel: Use formatter in simple logger exampleLukas Larsson
2018-05-02Add file_int.hrl to release targetJohn Högberg
2018-05-02ssl: Exclude DTLS tests for one more OpenSSL version for nowIngela Anderton Andin
2018-05-02ssl: Use sane input dataIngela Anderton Andin
2018-05-02Fix the missing link to typer in an installed systemBjörn Gustavsson
2018-05-02Updated OTP versionOTP-20.3.5Erlang/OTP
2018-05-02Update release notesErlang/OTP
2018-05-02Update version numbersErlang/OTP
2018-05-02Merge branch 'ingela/ssl/client-has-no-cert/ERL-599/OTP-15050' into maint-20Erlang/OTP
* ingela/ssl/client-has-no-cert/ERL-599/OTP-15050: ssl: Prepare for release ssl: Proper handling of clients that choose to send an empty answer to a certificate request
2018-05-02Merge branch 'john/erts/fix-heart-command-overflow/OTP-15034/ERIERL-166' ↵Erlang/OTP
into maint-20 * john/erts/fix-heart-command-overflow/OTP-15034/ERIERL-166: heart: Use ntohs instead of manual conversion # Conflicts: # lib/kernel/test/heart_SUITE.erl
2018-05-02ssl: Make sure help function works from all parts of test suiteIngela Anderton Andin
Depending on context trap_exit flag may be set or not. So always set trap_exit and consume the EXIT signal and then set it back.
2018-05-02Revert "Updated OTP version"Henrik
This reverts commit a0d7ce6d3613d9e031b674a6ba3dbb474c89b639.
2018-05-02Revert "Update release notes"Henrik
This reverts commit 202bb737e3deabfebee683266f4b7c42781eb521.
2018-05-02Revert "Update version numbers"Henrik
This reverts commit 345f7f527a4c26ef49cef0d81e2c8b71bf01ebc3.
2018-05-02Update OTP_VERSION for Release CandidateOTP-21.0-rc1Henrik
2018-04-30Updated OTP versionErlang/OTP
2018-04-30Update release notesErlang/OTP
2018-04-30Update version numbersErlang/OTP
2018-04-30Merge branch 'ingela/ssl/do-not-hardcode-cipher-suites'Ingela Anderton Andin
* ingela/ssl/do-not-hardcode-cipher-suites: ssl: Fix ECDSA key decode clause ssl: Avoid hardcoding of cipher suites and fix ECDH suite handling ssl: Run all test case combinations ssl: Update tests to reflect sslv3 is not supported by default
2018-04-30ssl: Fix ECDSA key decode clauseIngela Anderton Andin
2018-04-30ssl: Avoid hardcoding of cipher suites and fix ECDH suite handlingIngela Anderton Andin
ECDH suite handling did not use the EC parameters form the certs as expected.
2018-04-30ssl: Run all test case combinationsIngela Anderton Andin
Fix test case code to use keyAgreement for ECDH_ECDSA
2018-04-29Introduce is_map_key/2 guard BIFMichał Muskała
This complements the `map_get/2` guard BIF introduced in #1784. Rationale. `map_get/2` allows accessing map fields in guards, but it might be problematic in more complex guard expressions, for example: foo(X) when map_get(a, X) =:= 1 or is_list(X) -> ... The `is_list/1` part of the guard could never succeed since the `map_get/2` guard would fail the whole guard expression. In this situation, this could be solved by using `;` instead of `or` to separate the guards, but it is not possible in every case. To solve this situation, this PR proposes a `is_map_key/2` guard that allows to check if a map has key inside a guard before trying to access that key. When combined with `is_map/1` this allows to construct a purely boolean guard expression testing a value of a key in a map. Implementation. Given the use case motivating the introduction of this function, the PR contains compiler optimisations that produce optimial code for the following guard expression: foo(X) when is_map(X) and is_map_key(a, X) and map_get(a, X) =:= 1 -> ok; foo(_) -> error. Given all three tests share the failure label, the `is_map_key/2` and `is_map/2` tests are optimised away. As with `map_get/2` the `is_map_key/2` BIF is allowed in match specs.
2018-04-28ssl: Update tests to reflect sslv3 is not supported by defaultIngela Anderton Andin
2018-04-27Merge branch 'peterdmv/inets/prepare_for_release'Péter Dimitrov
* peterdmv/inets/prepare_for_release: inets: Correct runtime_dependencies before release Change-Id: I6d5bcfd870c072944df79a2f36ac69d8f88499d0
2018-04-27inets: Correct runtime_dependencies before releasePéter Dimitrov
Change-Id: Ia53fb6bbf0822608ce9f7afe9b905d3bb1ce0b11
2018-04-27Merge branch 'sverker/lc-thread-exit-free-fix'Sverker Eriksson
* sverker/lc-thread-exit-free-fix: erts: Fix memory leak in lock checker at thread exit
2018-04-27Merge branch 'rickard/process_info/OTP-14966'Rickard Green
* rickard/process_info/OTP-14966: Fix scheduled process_info() 'status' request Fix handling of process-info requests in receive
2018-04-27Fix scheduled process_info() 'status' requestRickard Green
2018-04-27Merge branch 'ingela/dtls/abbreviated'Ingela Anderton Andin
* ingela/dtls/abbreviated: dtls: Trigger resend in abbreviated handshake if change_cipher_spec is received to early.
2018-04-27dtls: Trigger resend in abbreviated handshake if change_cipher_specIngela Anderton Andin
is received to early.
2018-04-27Update primary bootstrapBjörn Gustavsson