aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-11-23Merge branch 'maint'Hans Nilsson
* maint: asn1: asn1:test now handles no_ok_wrapper and undec_rest asn1: Further adjustments on generated code asn1: Protect more by try..catch
2017-11-23Merge branch 'hans/asn1/asn1ct_test_fix/ERL-518/OTP-14787' into maintHans Nilsson
* hans/asn1/asn1ct_test_fix/ERL-518/OTP-14787: asn1: asn1:test now handles no_ok_wrapper and undec_rest
2017-11-23Merge branch 'hans/asn1/catch_error/ERL-518/OTP-14786' into maintHans Nilsson
2017-11-23Merge branch 'maint'Hans Nilsson
2017-11-23Merge branch 'hans/crypto/doc_engine_keys/OTP-14735' into maintHans Nilsson
2017-11-22Fix broken to_dis after merge from maint to masterBjörn Gustavsson
d8d07a7593d811 that added the to_dis option to the compiler no longer works when merged to master. That is because of 79f28cfd8df1b7 that removed some unused code in erts_debug. Fix this by adding a new function erts_debug:dis_to_file/2 and use it from compile module where we have access to the filename (in beam_listing we only have an opened file).
2017-11-22Merge branch 'maint'Hans Nilsson
2017-11-22Merge branch 'hans/crypto/cuddle_tests' into maintHans Nilsson
2017-11-21asn1: asn1:test now handles no_ok_wrapper and undec_restHans Nilsson
2017-11-21Merge branch 'maint'Sverker Eriksson
2017-11-21Merge branch 'sverker/nif-debug-bin-check' into maintSverker Eriksson
2017-11-21Merge branch 'sverker/crypto/fix-valgrind-assert' into maintSverker Eriksson
2017-11-21asn1: Further adjustments on generated codeHans Nilsson
2017-11-21asn1: Protect more by try..catchHans Nilsson
2017-11-21ssl: Marker inserted to enable a reference from cryptoHans Nilsson
2017-11-21crypto: Changes after reviewHans Nilsson
2017-11-21crypto: Fixes to make privkey_to_pubkey behave similar to other functionsHans Nilsson
2017-11-20Remove core dump risk in crypto.cHans Nilsson
2017-11-20crypto: Printout polishingHans Nilsson
2017-11-20crypto: Correct and extends tests of key fetching/usageHans Nilsson
2017-11-20crypto: Engine stored keys docHans Nilsson
2017-11-20Merge PR-1632 from margnus1/hipe-receive-opt OTP-14785Sverker Eriksson
HiPE: Optimise receives matching unique references
2017-11-20Merge pull request #1631 from peterdmv/stdlib/extend_uri_string/OTP-14747Péter Dimitrov
Extend uri_string module (compose_query and dissect_query)
2017-11-20Merge branch 'peterdmv/inets/autoredirect/ERL-333/OTP-14729'Péter Dimitrov
* peterdmv/inets/autoredirect/ERL-333/OTP-14729: inets: Add support for URI-references in Location
2017-11-20Merge branch 'peterdmv/inets/http_content_injection/ERL-456/OTP-14726'Péter Dimitrov
* peterdmv/inets/http_content_injection/ERL-456/OTP-14726: inets: Fix http content injection bug in httpc
2017-11-20Merge branch 'maint'Hans Nilsson
* maint: Updated OTP version Prepare release ssh: testcases for space trailing Hello msg ssh: Don't remove trailing WS in Hello msg ssh: dialyzer fixes ssh: Fix broken error handling during session setup Remove invalid EINTR loop around close(2) Conflicts: OTP_VERSION
2017-11-20Merge branch 'maint-20' into maintHans Nilsson
* maint-20: Updated OTP version Prepare release ssh: testcases for space trailing Hello msg ssh: Don't remove trailing WS in Hello msg ssh: dialyzer fixes ssh: Fix broken error handling during session setup Remove invalid EINTR loop around close(2) Conflicts: lib/ssh/test/ssh_options_SUITE.erl
2017-11-20Merge branch 'maint'Lukas Larsson
2017-11-20Merge branch 'lukas/system/improve_profile_docs/OTP-14633' into maintLukas Larsson
* lukas/system/improve_profile_docs/OTP-14633: erts: Add term2bin note about encoding guarantee Fix broken link in INSTALL howto system: Add info to profiling effeciency guide Update message queue and pinfo binary docs kernel: Clarify gen_tcp:listen documentation system: Add External OSS tools section to profiling guilde
2017-11-20Merge branch 'maint'Lukas Larsson
Conflicts: lib/compiler/src/beam_listing.erl
2017-11-20Merge branch 'lukas/compiler/add_to_dis/OTP-14784' into maintLukas Larsson
* lukas/compiler/add_to_dis/OTP-14784: compiler: Add +to_dis option that dumps loaded asm
2017-11-20compiler: Add +to_dis option that dumps loaded asmLukas Larsson
2017-11-20Merge branch 'maint'Lukas Larsson
2017-11-20Merge branch 'lukas/docs/xmllint_fixes/OTP-14721' into maintLukas Larsson
* lukas/docs/xmllint_fixes/OTP-14721: ssl/ssh: Remove/ignore unused XML_FILES doc files Refactor xmllint check and make it fail on failure Add toplevel xmllint make target Conflicts: lib/crypto/doc/src/Makefile
2017-11-20ssl/ssh: Remove/ignore unused XML_FILES doc filesLukas Larsson
2017-11-20Merge branch 'bjorn/make_port/OTP-14704'Björn Gustavsson
* bjorn/make_port/OTP-14704: Avoid using the efile driver in test suites
2017-11-20Merge branch 'lukas/stdlib/maps_iterators/OTP-14012'Lukas Larsson
* lukas/stdlib/maps_iterators/OTP-14012: erts: Limit size of first iterator for hashmaps Update primary bootstrap Update preloaded modules erts: Remove erts_internal:maps_to_list/2 stdlib: Make io_lib and io_lib_pretty use maps iterator erts: Implement batching maps:iterator erts: Implement maps path iterator erts: Implement map iterator using a stack stdlib: Introduce maps iterator API Conflicts: bootstrap/lib/stdlib/ebin/io_lib.beam bootstrap/lib/stdlib/ebin/io_lib_pretty.beam erts/emulator/beam/bif.tab erts/preloaded/ebin/erlang.beam erts/preloaded/ebin/erts_internal.beam erts/preloaded/ebin/zlib.beam
2017-11-20erts: Limit size of first iterator for hashmapsLukas Larsson
2017-11-20Update primary bootstrapLukas Larsson
2017-11-20Update preloaded modulesLukas Larsson
2017-11-20erts: Remove erts_internal:maps_to_list/2Lukas Larsson
This function is no longer needed as maps:iterator has now been implemented.
2017-11-20stdlib: Make io_lib and io_lib_pretty use maps iteratorLukas Larsson
2017-11-20erts: Implement batching maps:iteratorLukas Larsson
This iterator implementation fetches multiple elements to iterate over in one call to erts_internal:maps_next instead of one at a time. This means that the memory usage will go up for the iterator as we are buffering elements, but the usage is still bounded. In this implementation the max memory usage is 1000 words. Using this approach makes the iterator as fast as using maps:to_list, so maps:iterator/2 has been removed.
2017-11-17Avoid using the efile driver in test suitesBjörn Gustavsson
The efile driver will soon be reimplemented as a BIF. Instead of opening a port based on efile, use hd(erlang:ports()). It is a reasonable safe assumption that the runtime will continue to use use at least some ports.
2017-11-17Updated OTP versionOTP-20.1.6Erlang/OTP
2017-11-17Prepare releaseErlang/OTP
2017-11-17Merge branch 'rickard/node-mon-proc-exit-race/maint-20/OTP-14781' into maint-20Erlang/OTP
* rickard/node-mon-proc-exit-race/maint-20/OTP-14781: Fix triggering of node monitors
2017-11-17Merge branch 'hans/ssh/SYN_RST/OTP-14778' into maint-20Erlang/OTP
* hans/ssh/SYN_RST/OTP-14778: ssh: dialyzer fixes ssh: Fix broken error handling during session setup
2017-11-17Merge branch 'hans/ssh/dont_remove_trailing_ws_20/OTP-14763' into maint-20Erlang/OTP
* hans/ssh/dont_remove_trailing_ws_20/OTP-14763: ssh: testcases for space trailing Hello msg ssh: Don't remove trailing WS in Hello msg
2017-11-17Merge branch 'john/erts/fix-close-eintr/OTP-14775' into maint-20Erlang/OTP
* john/erts/fix-close-eintr/OTP-14775: Remove invalid EINTR loop around close(2)