aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2019-03-04Merge pull request #2164 from josevalim/jv-set-env-maintSiri Hansen
Add application:set_env/1 and application:set_env/2 OTP-15642
2019-03-01Add application:set_env/1 and application:set_env/2José Valim
It is equivalent to calling application:set_env/4 on each application individually, except it is more efficient. When given duplicate apps or duplicate keys, set_env/1 and set_env/2 will warn. The warning will also be emitted during boot: $ erl -config dupkeys.config -s erlang halt 2019-02-27 11:16:02.653100 application: kernel; duplicate parameter: key1 =WARNING REPORT==== 27-Feb-2019::11:16:02.653100 === application: kernel; duplicate parameter: key1 $ erl -config dupapps.config -s erlang halt 2019-02-27 11:16:02.653100 duplicate application config: kernel =WARNING REPORT==== 27-Feb-2019::11:16:02.653100 === duplicate application config: kernel Prior to this patch, the behaviour was unspecified, and duplicate keys and duplicate apps would behave different depending on the amount of config, the name of the config files, and how those configs would be listed. The goal is to raise an error in the future.
2019-02-28Merge branch 'hans/crypto/bad_ret_fips/OTP-15634' into maintHans Nilsson
* hans/crypto/bad_ret_fips/OTP-15634: crypto: Fix bad return value for aes_cfb8 and aes_cfb128 if FIPS_SUPPORT crypto: Fix bad return code for eddsa if FIPS_SUPPORT
2019-02-27Merge branch 'hans/crypto/cuddle_tests' into maintHans Nilsson
* hans/crypto/cuddle_tests: crypto: Remove assertion crypto: Fail if FIPS mode is present but can't be enabled crypto: Remove blowfish_SUITE. crypto: Update crypto_SUITE checking of FIPS
2019-02-27crypto: Remove assertionHans Nilsson
This is not needed any more
2019-02-27crypto: Fail if FIPS mode is present but can't be enabledHans Nilsson
2019-02-27crypto: Remove blowfish_SUITE.Hans Nilsson
The tests are a subset of the newer and larger crypto_SUITE.
2019-02-27crypto: Update crypto_SUITE checking of FIPSHans Nilsson
The testing for not supported were missing in some cases
2019-02-27Merge branch 'hasse/edoc/helpful_message/OTP-15605/ERL-841' into maintHans Bolinder
* hasse/edoc/helpful_message/OTP-15605/ERL-841: edoc: Print a helpful message if reading source file fails
2019-02-26crypto: Fix bad return value for aes_cfb8 and aes_cfb128 if FIPS_SUPPORTHans Nilsson
2019-02-25crypto: Fix bad return code for eddsa if FIPS_SUPPORTHans Nilsson
2019-02-25Merge branch 'dgud/mnesia/overload-raise/ERIERL-310/OTP-15619' into maintDan Gudmundsson
* dgud/mnesia/overload-raise/ERIERL-310/OTP-15619: mnesia: Avoid raise in overload reports
2019-02-25Merge branch 'dialyzer/hasse/fix_bug_erl_bif_types/OTP-15570' into maintHans Bolinder
* dialyzer/hasse/fix_bug_erl_bif_types/OTP-15570: dialyzer: Fix maps as parameter of opaque types dialyzer: Fix key check of lists:key{search,member,find}()
2019-02-23Merge pull request #2155 from psyeugenic/egil/fix-mac-compile-warningsRickard Green
erts: Fix macro redefinition OTP-15629
2019-02-22erts: Fix macro redefinitionBjörn-Egil Dahlberg
LIST_NEXT and LIST_PREV causes macro redefinitions from other include files. beam/erl_ao_firstfit_alloc.c:103:9: warning: 'LIST_NEXT' macro redefined [-Wmacro-redefined] ^ /usr/include/sys/queue.h:507:9: note: previous definition is here ^ 1 warning generated. beam/erl_bestfit_alloc.c:125:9: warning: 'LIST_NEXT' macro redefined [-Wmacro-redefined] ^ /usr/include/sys/queue.h:507:9: note: previous definition is here ^
2019-02-22Merge pull request #2153 from bjorng/bjorn/stdlib/minor-clarificationBjörn Gustavsson
Clarify the atomic guarantees for ets:update_counter()
2019-02-22Clarify the atomic guarantees for ets:update_counter()Björn Gustavsson
The phrasing "no process can access the ETS table in the middle of the operation" implies that the entire table is looked during the operation, which is not true if `write_concurrency` is enabled.
2019-02-22Merge pull request #2148 from llelf/sed-otp_buildLukas Larsson
Fix a particular sed invocation in otp_build
2019-02-22Merge branch 'ingela/diameter/ssl-dialyzer-types' into maintIngela Anderton Andin
* ingela/diameter/ssl-dialyzer-types: diameter: Update to use exported types
2019-02-22Merge branch 'ingela/ssl/doc-enhancements' into maintIngela Anderton Andin
* ingela/ssl/doc-enhancements: ssl: Enhance documentation after "use-spec-rewrite"
2019-02-22ssl: Enhance documentation after "use-spec-rewrite"Ingela Anderton Andin
2019-02-22mnesia: Avoid raise in overload reportsDan Gudmundsson
Several processes could invoke adjust_log_writes, which could cause overload reports.
2019-02-21Merge branch 'siri/logger/check-inode-of-log/ERL-850/OTP-15578' into maintSiri Hansen
* siri/logger/check-inode-of-log/ERL-850/OTP-15578: [logger] Keep track of inode for logger_std_h log file
2019-02-21Merge branch 'raimo/ssl/tls-optimization/OTP-15529' into maintRaimo Niskanen
* raimo/ssl/tls-optimization/OTP-15529: Inline local function Optimize binary matching Clean up module boundaries Remove redundant return of CipherState Use iovec() internally in send path Small binary handling optimizations Optimize read_application_data with Okasaki queue Try to optimize decode_cipher_text/3 Optimize application data aggregation Optimize TLS record parsing with Okasaki queue Cache strong_random_bytes for IV Optimize padding Produce less garbage in encrypt loop Reorganize #data{} Tidy up state machine Add server GC info to bench results
2019-02-21edoc: Print a helpful message if reading source file failsHans Bolinder
See also https://bugs.erlang.org/browse/ERL-841.
2019-02-21Merge branch 'hasse/stdlib/fix_erl_pp/ERL-818/OTP-15592' into maintHans Bolinder
* hasse/stdlib/fix_erl_pp/ERL-818/OTP-15592: stdlib: Fix a bug in the Erlang Pretty Printer
2019-02-21dialyzer: Fix maps as parameter of opaque typesHans Bolinder
The clause added for maps in commit 1a7c41be is corrected.
2019-02-21dialyzer: Fix key check of lists:key{search,member,find}()Hans Bolinder
Replace integers and floats with t_number() since keysearch et al compare the key (rather than match). Corrects the commit b3c8e94.
2019-02-20Merge branch 'sverker/erts/term_to_binary-reductions/ERL-774/OTP-15514' into ↵Sverker Eriksson
maint * sverker/erts/term_to_binary-reductions/ERL-774/OTP-15514: erts: Consume reductions for strings in term_to_binary erts: Reduce number of list traversals in term_to_binary
2019-02-20erts: Consume reductions for strings in term_to_binarySverker Eriksson
Cost per string byte, but we still don't yield mid-string.
2019-02-20Merge branch 'sverker/enif_consume_timeslice-dirty-nop/OTP-15604' into maintSverker Eriksson
* sverker/enif_consume_timeslice-dirty-nop/OTP-15604: erts: Make enif_consume_timeslice no-op on dirty sched
2019-02-20use erts’ ERL_TRY_LINK_JAVA in common_test/test_server/configure.inAntonio Nikishaev
2019-02-20Revert "Fix a particular sed invocation in otp_build"Antonio Nikishaev
This reverts commit c8544cf07399555b61d84174e0887966f982deea.
2019-02-19Fix a particular sed invocation in otp_buildAntonio Nikishaev
Otherwise sed cannot process `lib/common_test/test_server/configure.in` when run under UTF-8 locale. That file uses m4’s changequote(«, »)`, in latin-1.
2019-02-19Merge branch 'siri/logger/pretty-print-config/OTP-15600' into maintSiri Hansen
* siri/logger/pretty-print-config/OTP-15600: [logger] Add pretty print function for configuration
2019-02-19[logger] Add pretty print function for configurationSiri Hansen
2019-02-19Merge branch 'sverker/heart-nice-exit/OTP-15599' into maintSverker Eriksson
* sverker/heart-nice-exit/OTP-15599: erts: Avoid heart killing a nicely exiting emulator
2019-02-19Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
* hans/ssh/cuddle_tests: ssh: Refactor decryption in ssh_protocol_SUITE
2019-02-19Merge branch 'hasse/dialyzer/fix_contract_check/OTP-15562/ERL-845' into maintHans Bolinder
* hasse/dialyzer/fix_contract_check/OTP-15562/ERL-845: dialyzer: Fix a bug regarding contracts
2019-02-18erts: Remove etp macro offsetofLukas Larsson
The macro command was added quite recently and far from all of our testmachines have this command
2019-02-18erts: Make enif_consume_timeslice no-op on dirty schedSverker Eriksson
2019-02-18Merge branch 'lukas/erts/fix-exit_status-netbsd/OTP-15558' into maintLukas Larsson
* lukas/erts/fix-exit_status-netbsd/OTP-15558: Fix EV_DISPATCH detection on NetBSD
2019-02-18ssh: Refactor decryption in ssh_protocol_SUITEHans Nilsson
Previously this test suite used a short-cut that didn't work well with the new crypto API being experimented with in other branches. This commit uses the legacy decode and decryption functions in ssh_transport. It is of course normally a bad idea to test something with itself. However, other test suites test the interoperability with OpenSSH and by that implicitly of the decoding/decryption. The ssh_protocol_SUITE tests sending malformed and even malicious PDUs to the Erlang/OTP SSH implementation. Therefore the tests in this suite is not dependent on being different than thoose of the system under test.
2019-02-18Inline local functionRaimo Niskanen
2019-02-18Optimize binary matchingRaimo Niskanen
2019-02-18Merge branch 'ingela/ssl/shrink-state' into maintIngela Anderton Andin
* ingela/ssl/shrink-state: ssl: Remove duplicate record_cb handling ssl: Add test case for continued handshake with a timeout ssl: Use gen_statem named timers to handle connection and recv timeouts ssl: Move and rename diffie_hellman_keys and srp_keys to kex_keys ssl: Move key_algorithm to handshake_env ssl: srp ssl: Rename ssl: Move diffie_hellman_params to handshake_env ssl: Move and rename psk_identity state record field ssl: Move premaster_secret to handshake_env ssl: Make flight_state DTLS specific ssl: Add private_key to connection_env ssl: Remove unused record field ssl: Add erl_dist_handle to connection_env ssl: Add negotiated_version to connection_env ssl: Add key exchange items to handshake_env ssl: Add hashsign_algorithm and cert_hashsign_algorithm to handshake_env ssl: Add downgrade handling to connection_env ssl: Create connection_env ssl: Handle renegotiation and extensions in handshake_env
2019-02-18stdlib: Fix a bug in the Erlang Pretty PrinterHans Bolinder
Long atom names in combination with <c><<>></c> could cause a crash.
2019-02-18Merge branch 'maint-21' into maintRaimo Niskanen
* maint-21: Updated OTP version Prepare release
2019-02-18Merge branch 'dgud/wx/extend-functionality/OTP-15587' into maintDan Gudmundsson
* dgud/wx/extend-functionality/OTP-15587: Fix showModal crash on Mojave Add wxGCDC wx: Add wxDisplay wx: Change wxFONTWEIGHT enums Let wxwidgets check events
2019-02-18Merge tag 'OTP-20.3.2.1' into maintSiri Hansen
=== OTP-20.3.2.1 === Changed Applications: - common_test-1.15.4.0.1 Unchanged Applications: - asn1-5.0.5 - compiler-7.1.5 - cosEvent-2.2.2 - cosEventDomain-1.2.2 - cosFileTransfer-1.2.2 - cosNotification-1.2.3 - cosProperty-1.2.3 - cosTime-1.2.3 - cosTransactions-1.3.3 - crypto-4.2.1 - debugger-4.2.4 - dialyzer-3.2.4 - diameter-2.1.4 - edoc-0.9.2 - eldap-1.2.3 - erl_docgen-0.7.2 - erl_interface-3.10.1 - erts-9.3 - et-1.6.1 - eunit-2.3.5 - hipe-3.17.1 - ic-4.4.3 - inets-6.5 - jinterface-1.8.1 - kernel-5.4.3 - megaco-3.18.3 - mnesia-4.15.3 - observer-2.7 - odbc-2.12.1 - orber-3.8.4 - os_mon-2.4.4 - otp_mibs-1.1.2 - parsetools-2.1.6 - public_key-1.5.2 - reltool-0.7.5 - runtime_tools-1.12.5 - sasl-3.1.1 - snmp-5.2.10 - ssh-4.6.7 - ssl-8.2.5 - stdlib-3.4.5 - syntax_tools-2.1.4 - tools-2.11.2 - wx-1.8.3 - xmerl-1.3.16 * tag 'OTP-20.3.2.1': Updated OTP version Prepare release