summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove comments about deprecation in OTP-21dgud-string-deprDan Gudmundsson2018-05-081-1/+1
| | | I had missed the one in lower section.
* Merge pull request #1801 from dtip/update-global-name-specHans Bolinder2018-05-082-4/+4
|\ | | | | Update global name typespec
| * Update global name typespecDaniel Tipping2018-04-272-4/+4
| |
* | Merge pull request #1800 from erszcz/masterHans Bolinder2018-05-073-6/+5
|\ \ | | | | | | Fix syntactic issues in EDoc comments across some libs
| * | Fix syntactic issues in EDoc comments across some libsRadek Szymczyszyn2018-05-043-6/+5
| | | | | | | | | | | | | | | See https://github.com/erszcz/docsh/issues/23 for an explanation about how the files were found.
* | | Merge branch 'siri/logger-fix'Siri Hansen2018-05-0718-263/+410
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * siri/logger-fix: Change logger callback removing_handler/1 to removing_handler/2 Don't crash logger_server due to unexpected message Add logger:update_process_metadata/1 Improve documentation of logger:set_*_config functions Change return type from logger_formatter:format/2 Improve test of logger_disk_log_h and logger_std_h Update logger documentation Set single_line=true by default in logger_formatter
| * | | Change logger callback removing_handler/1 to removing_handler/2Siri Hansen2018-05-077-15/+15
| | | |
| * | | Don't crash logger_server due to unexpected messageSiri Hansen2018-05-071-1/+7
| | | |
| * | | Add logger:update_process_metadata/1Siri Hansen2018-05-073-6/+36
| | | |
| * | | Improve documentation of logger:set_*_config functionsSiri Hansen2018-05-071-2/+36
| | | |
| * | | Change return type from logger_formatter:format/2Siri Hansen2018-05-072-21/+6
| | | | | | | | | | | | | | | | This used to be string() is now changed to unicode:chardata().
| * | | Improve test of logger_disk_log_h and logger_std_hSiri Hansen2018-05-072-82/+136
| | | |
| * | | Update logger documentationSiri Hansen2018-05-034-112/+146
| | | |
| * | | Set single_line=true by default in logger_formatterSiri Hansen2018-05-035-24/+28
| | | |
* | | | Update primary bootstrapBjörn Gustavsson2018-05-077-0/+0
| | | |
* | | | Update preloaded modulesBjörn Gustavsson2018-05-074-0/+0
| | | |
* | | | Merge pull request #1802 from michalmuskala/map-is-key-bifBjörn Gustavsson2018-05-0718-15/+165
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Introduce is_map_key/2 guard BIF OTP-15037
| * | | | Introduce is_map_key/2 guard BIFMichał Muskała2018-04-2918-15/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #1805 from bjorng/bjorn/hipe/remove-unused-modulesBjörn Gustavsson2018-05-075-2154/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove unused source files in lib/hipe/opt
| * | | | | Remove unused source files in lib/hipe/optBjörn Gustavsson2018-05-045-2154/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge branch 'john/tools/cuddle-lcnt-tests'John Högberg2018-05-071-4/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * john/tools/cuddle-lcnt-tests: Ensure that lcnt server is terminated after lcnt:stop/0
| * | | | | | Ensure that lcnt server is terminated after lcnt:stop/0John Högberg2018-05-071-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge branch 'hans/ssh/rekey_limit/OTP-15069'Hans Nilsson2018-05-045-20/+191
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | * hans/ssh/rekey_limit/OTP-15069: ssh: Extend rekey_limit to also take an optional time
| * | | | | | ssh: Extend rekey_limit to also take an optional timeHans Nilsson2018-05-045-20/+191
|/ / / / / /
* | | | | | scripts/diffable: Include the hipe applicationBjörn Gustavsson2018-05-041-0/+5
| | | | | |
* | | | | | Merge pull request #1766 from seancribbs/add_erl_types_suiteHans Bolinder2018-05-043-189/+203
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move erl_types test into a common_test suite
| * | | | | | Move erl_types test into a common_test suiteSean Cribbs2018-04-263-189/+203
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing test/0 function in erl_types was not being run in the OTP test suite, and it had not been updated to match the implementation in the module (maps vs. dict). This commit removes the macros that excluded some functions, exports the functions now included in the module, and extracts the test into a new common_test suite, erl_types_SUITE.
* | | | | | Merge branch 'bjorn/fix-typer-link'Björn Gustavsson2018-05-041-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | * bjorn/fix-typer-link: Fix the missing link to typer in an installed system
| * | | | | Fix the missing link to typer in an installed systemBjörn Gustavsson2018-05-021-1/+1
| | | | | |
* | | | | | Merge branch 'john/kernel/add-file_int-to-release'John Högberg2018-05-041-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * john/kernel/add-file_int-to-release: Add file_int.hrl to release target
| * | | | | | Add file_int.hrl to release targetJohn Högberg2018-05-021-1/+1
| | | | | | |
* | | | | | | Merge branch 'john/erts/fix-windows-symlinks/OTP-15062/ERL-615'John Högberg2018-05-041-2/+48
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | * john/erts/fix-windows-symlinks/OTP-15062/ERL-615: Stop assuming that all NTFS reparse points are links
| * | | | | | Stop assuming that all NTFS reparse points are linksJohn Högberg2018-05-031-2/+48
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge branch 'ingela/ssl/testcuddling'Ingela Anderton Andin2018-05-032-3/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | | ssl: Exclude DTLS tests for one more OpenSSL version for nowIngela Anderton Andin2018-05-021-0/+2
| | | | | | |
| * | | | | | ssl: Use sane input dataIngela Anderton Andin2018-05-021-3/+4
| | | | | | |
| * | | | | | ssl: Make sure help function works from all parts of test suiteIngela Anderton Andin2018-05-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge branch 'lukas/kernel/logger-docs'Lukas Larsson2018-05-032-30/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lukas/kernel/logger-docs: Add xmllint to travis build kernel: Use formatter in simple logger example
| * | | | | | | Add xmllint to travis buildLukas Larsson2018-05-031-0/+2
| | | | | | | |
| * | | | | | | kernel: Use formatter in simple logger exampleLukas Larsson2018-05-021-30/+7
| |/ / / / / /
* | | | | | | Merge branch 'maint'John Högberg2018-05-038-11/+45
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | | Merge branch 'maint-20' into maintJohn Högberg2018-05-0313-50/+124
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | | | | Updated OTP versionOTP-20.3.5Erlang/OTP2018-05-022-1/+2
| | | | | | | |
| | * | | | | | Update release notesErlang/OTP2018-05-022-0/+31
| | | | | | | |
| | * | | | | | Update version numbersErlang/OTP2018-05-021-1/+1
| | | | | | | |
| | * | | | | | Merge branch 'ingela/ssl/client-has-no-cert/ERL-599/OTP-15050' into maint-20Erlang/OTP2018-05-026-41/+79
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | * | | | | | ssl: Prepare for releaseIngela Anderton Andin2018-04-272-3/+1
| | | | | | | | |
| | | * | | | | | ssl: Proper handling of clients that choose to send an emptyIngela Anderton Andin2018-04-274-38/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | answer to a certificate request Solves ERL-599
| | * | | | | | | Merge branch 'john/erts/fix-heart-command-overflow/OTP-15034/ERIERL-166' ↵Erlang/OTP2018-05-022-7/+11
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | heart: Use ntohs instead of manual conversionJohn Högberg2018-04-242-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiplying a signed char by 256 is undefined behavior and caused problems on some platforms when the length was long enough. We could cast it to an unsigned int to make it work, but it's best not to reinvent the wheel. Fixes OTP-15034