aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2019-04-15Merge branch 'bmk/snmp/manager/20190410/test_suite_tweaking'Micael Karlberg
2019-04-15Merge branch 'maint'Péter Dimitrov
* maint: inets: Add tests for erl_script_timeout inets: Fix erl_script_timeout handling in mod_esi Change-Id: I1e8a265f44920780c4b8bf440047225f4dc208d6
2019-04-15Merge branch 'peterdmv/inets/fix_erl_script_timeout/ERIERL-345/OTP-15769' ↵Péter Dimitrov
into maint * peterdmv/inets/fix_erl_script_timeout/ERIERL-345/OTP-15769: inets: Add tests for erl_script_timeout inets: Fix erl_script_timeout handling in mod_esi Change-Id: I5ac5b70598338ce5d068b51ecf58606fae1a2ebf
2019-04-15Merge branch 'maint'Rickard Green
* maint: Add appup and code_change Fix inadvertently broad monitor
2019-04-15Merge branch 'anders/diameter/distribution/OTP-15768' into maintRickard Green
* anders/diameter/distribution/OTP-15768: Add appup and code_change Fix inadvertently broad monitor
2019-04-15Update primary bootstrapBjörn Gustavsson
2019-04-15Merge pull request #2209 from bjorng/bjorn/compiler/fix-literal-encodingBjörn Gustavsson
Optimize encoding of simple literals
2019-04-15Optimize encoding of simple literalsBjörn Gustavsson
`beam_asm` would encode `{literal,[]}`, `{literal,erlang}`, and `{literal,42}` in a less efficient way than the equivalent values `nil`, `{atom,erlang}`, and `{integer,42}`. That would increase the size of BEAM files and could increase the loaded code size. It would probably not harm performance, because `literal` was only used this way in code that generates `badmatch` and `case_clause` exceptions.
2019-04-14inets: Add tests for erl_script_timeoutPéter Dimitrov
2019-04-14inets: Fix erl_script_timeout handling in mod_esiPéter Dimitrov
2019-04-14Add appup and code_changeAnders Svensson
For the parent commit as a diameter 2.2 patch.
2019-04-14Fix inadvertently broad monitorAnders Svensson
Commit d9d918b2 added a gen_server whose purpose is to keep track of visible nodes on which diameter_dist:attach/1 has been called to register a node as a handler of incoming Diameter requests when diameter_dist:route_session/2 is configured as spawn_opt MFA. The server contacts visible nodes at init in order to request information, but instead of monitoring visible to also be able to request information at nodeup, it monitored on all nodes, resulting in gen_server casts even to hidden nodes. Monitor only on visible nodes since a hidden node may not be able to deal with the new message.
2019-04-12Merge 'maint' into 'master'Sverker Eriksson
2019-04-12Merge 'sverker/doc-big-creation-tags/OTP-15766' into 'maint'Sverker Eriksson
2019-04-12Merge branch 'maint'Hans Nilsson
* maint: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # make/otp_version_tickets_in_merge
2019-04-12Merge branch 'maint-21' into maintHans Nilsson
* maint-21: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
2019-04-12[snmp|manager|test] Try to estimate appropriate timeouts for start/stopMicael Karlberg
For the notify_started02 test case we (now) try estimate how long we should wait for completion (based on the time of the first iteration). On slow machines, it takes longer to start and stop the manager, so adjust the total timeout accordingly.
2019-04-12Updated OTP versionOTP-21.3.4Erlang/OTP
2019-04-12Prepare releaseErlang/OTP
2019-04-12Merge branch 'lukas/erl_interface/depend-fix/OTP-15757' into maint-21Erlang/OTP
* lukas/erl_interface/depend-fix/OTP-15757: erl_interface: Generate dependencies at compile time
2019-04-12Merge branch 'lukas/erts/fix-fd-driver-select/OTP-15753' into maint-21Erlang/OTP
* lukas/erts/fix-fd-driver-select/OTP-15753: erts: Fix sys_driver to correctly deselect fds
2019-04-12Merge branch 'sverker/crypto/bcmp-memcmp-fix/OTP-15750' into maint-21Erlang/OTP
* sverker/crypto/bcmp-memcmp-fix/OTP-15750: crypto: Fix link error on windows
2019-04-12Merge branch 'rickard/ts-find-ubuntu-inst/OTP-15716' into maint-21Erlang/OTP
* rickard/ts-find-ubuntu-inst/OTP-15716: Find installed OTP for Ubuntu
2019-04-12Merge branch 'maint'Hans Nilsson
* maint: ssh: Present peername for accept_callback fun also for Sockets ssh: Add ssh_channel:init/1
2019-04-12Merge branch 'maint-21' into maintHans Nilsson
* maint-21: ssh: Present peername for accept_callback fun also for Sockets ssh: Add ssh_channel:init/1
2019-04-12Merge branch 'hans/ssh/accept_callback_socket/OTP-15763' into maint-21Hans Nilsson
* hans/ssh/accept_callback_socket/OTP-15763: ssh: Present peername for accept_callback fun also for Sockets
2019-04-12Merge branch 'hans/ssh/ssh_channel-init/OTP-15762' into maint-21Hans Nilsson
* hans/ssh/ssh_channel-init/OTP-15762: ssh: Add ssh_channel:init/1
2019-04-12Merge branch 'ingela/ssl/cipher-suite-conversions'Ingela Anderton Andin
* ingela/ssl/cipher-suite-conversions: ssl: Add functions to convert between diffrent cipher suite formats
2019-04-12Merge branch 'bjorn/erts/measure-process_main/OTP-15620'Björn Gustavsson
* bjorn/erts/measure-process_main/OTP-15620: Add benchmark Add erts_debug:interpreter_size/0
2019-04-12ssl: Add functions to convert between diffrent cipher suite formatsIngela Anderton Andin
2019-04-12Merge branch 'hasse/stdlib/erl_pp_quoted_atom_types/OTP-15756'Hans Bolinder
* hasse/stdlib/erl_pp_quoted_atom_types/OTP-15756: stdlib: Add option 'quote_singleton_atom_types' to erl_pp
2019-04-12stdlib: Add option 'quote_singleton_atom_types' to erl_ppHans Bolinder
The new option can be used by Dialyzer, which has traditionally quoted singleton atom types. The OTP team has decided not to use the convention in OTP documentation, at least not for now. That is why the option is needed. EDoc does not use the new option. Syntax Tools does not have a similar option.
2019-04-12Merge branch 'peterdmv/ssl/dtls-fix'Péter Dimitrov
* peterdmv/ssl/dtls-fix: ssl: Fix faulty match of Socket in handle_info/3 Change-Id: Ied8228b8f2eb88e50a47fc101331d7913fdb1de6
2019-04-11Merge branch 'maint'Micael Karlberg
2019-04-11Merge branch 'bmk/snmp/20190328/get_mechanism/OTP-15691' into maintMicael Karlberg
2019-04-11erts: Document NEW_PID, NEW_PORT, NEWER_REFERENCESverker Eriksson
2019-04-11ssl: Fix faulty match of Socket in handle_info/3Péter Dimitrov
Fix dtls_connection:handle_info/3 to correctly match the Socket in static_env. Change-Id: Iddaad0514c2413abac6d9a06292556e07acc7729
2019-04-11ssh: Present peername for accept_callback fun also for SocketsHans Nilsson
2019-04-11ssh: Add ssh_channel:init/1Hans Nilsson
that was misstakeingly lost when introducing ssh_client_channel.erl
2019-04-11Merge branch 'sverker/test-cuddle'Sverker Eriksson
* sverker/test-cuddle: stdlib: Remove ets_SUITE:time_lookup
2019-04-11Merge branch 'sverker/node-table-cmp-0-creation-fix'Sverker Eriksson
* sverker/node-table-cmp-0-creation-fix: erts: Revert creation 0 as wildcard in node_table_cmp
2019-04-11Merge branch 'sverker/revert-big-creation'Sverker Eriksson
* sverker/revert-big-creation: Revert "erts: Make DFLAG_BIG_CREATION mandatory" Revert "erts: Remove old encoding of pids, ports and refs" Revert "erl_interface: Remove old encoding of pid,port,refs" Revert "epmd: Support 32-bit creation values in local node" Revert "jinterface: Remove old encoding of pid,port,refs" Revert "erl_interface: Support 32-bit creation local cnode" Revert "erts: Document new EPMD response ALIVE2_X_RESP"
2019-04-11Merge branch 'bjorn/ct/clear_erl_aflags'Björn Gustavsson
* bjorn/ct/clear_erl_aflags: Clear ERL_AFLAGS when starting a previous release
2019-04-11Add benchmarkBjörn Gustavsson
2019-04-11Merge branch 'hans/crypto/rename_api/OTP-15644'Hans Nilsson
* hans/crypto/rename_api/OTP-15644: crypto: Rename 'crypto_(init|update)_dyn_iv' to 'crypto_dyn_iv_(init|update)' crypto: Rename crypto_aead to crypto_one_time_aead
2019-04-11crypto: Rename 'crypto_(init|update)_dyn_iv' to 'crypto_dyn_iv_(init|update)'Hans Nilsson
2019-04-11crypto: Rename crypto_aead to crypto_one_time_aeadHans Nilsson
2019-04-11Merge branch 'hans/crypto/cuddle_docs'Hans Nilsson
* hans/crypto/cuddle_docs: crypto: Doc review comments
2019-04-11crypto: Doc review commentsHans Nilsson
This reverts commit c207d2438017d15e32f47f5ff7168759b3d123fc.
2019-04-11Merge branch 'hans/public_key/rsa_opts/ERL-878/OTP-15754'Hans Nilsson
* hans/public_key/rsa_opts/ERL-878/OTP-15754: public_key: Let options down to crypto from public_encrypt etc