aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-02-21erts: Fix literal size bug when only old instance existsSverker Eriksson
fix for already merged but not releases 808b2f4d53e446aed07f85716c5c4b85abb3d18a
2017-02-21Document ssl_session_cache_api's size/1 callbackSteven Danna
The size/1 callback was added as a non-optional callback in 42b8a29dbae1d626f32bc16dd81a129caf741138 but wasn't added to the documentation for the ssl_session_cache_api behavior. Signed-off-by: Steven Danna <[email protected]>
2017-02-21kernel: Fix hanging os:cmd race conditionLukas Larsson
If the port terminates before Port ! close is issued, there will be no 'closed' reply, so the old code would hang. As it turns out there is no way to figure out if a closed reply is supposed to come as that reply is sent after all links and monitors are triggered. So we have to use the synchronous port_close to close the port.
2017-02-21stdlib: Improve pretty-printing of terms with mapsHans Bolinder
As of committing this branch maps:fold/3 calls maps:to_list/1, which means that the time and memory needed for printing maps is not always proportional to the size of the generated deep list of characters.
2017-02-21erts: Emasculate binaries that are scheduled in port_controlLukas Larsson
2017-02-21filename: Add safe_relative_path/1Björn Gustavsson
Add safe_relative_path/1 to guard against directory traversal attacks. It either returns a shorter path without any ".." or "." components, or 'unsafe' if an ".." component would climb up above the root of the relative path. Here are a few examples: safe_relative_path("a/b/..") => "a" safe_relative_path("a/..") => "" safe_relative_path("a/../..") => unsafe safe_relative_path("/absolute/path") => unsafe The returned path can be used directly or combined with an absolute path using filename:join/2.
2017-02-21Merge branch 'hasse/dialyzer/correct_tests'Hans Bolinder
* hasse/dialyzer/correct_tests: dialyzer: Correct test cases after removal of erlang:hash/2
2017-02-21dialyzer: Correct test cases after removal of erlang:hash/2Hans Bolinder
2017-02-20Fix ErlNifMonitor handlingSverker Eriksson
2017-02-20Remove faulty debug ASSERTSverker Eriksson
Why did I add that?
2017-02-20erts: Skip nif_SUITE:select on windowsSverker Eriksson
for now...
2017-02-20Fix enif_select for windowsSverker Eriksson
2017-02-20Fix whitebox monitor testsSverker Eriksson
2017-02-20Fix erl_nif docSverker Eriksson
2017-02-20Expand nif_SUITE:monitor_frenzy to verify dtor callsSverker Eriksson
2017-02-20Expand nif_SUITE:monitor_frenzy with binary_to_termSverker Eriksson
to provoke resource revival race.
2017-02-20erts: Avoid revival of dying resource by dec_termSverker Eriksson
2017-02-20Merge branch 'master' into sverker/enif_selectSverker Eriksson
Conflicts: erts/emulator/beam/erl_binary.h erts/emulator/beam/erl_monitors.c erts/emulator/beam/erl_nif.c erts/emulator/beam/global.h erts/emulator/test/nif_SUITE_data/nif_SUITE.c
2017-02-20erts: Add enif_compare_monitorsSverker Eriksson
# Conflicts: # erts/emulator/test/nif_SUITE_data/nif_SUITE.c
2017-02-20Merge branch 'rickard/magic-references-fixes'Sverker Eriksson
* rickard/magic-references-fixes: Fix driver monitor implementation Handle magic refs in db_cleanup_offheap_comp()
2017-02-20Fix driver monitor implementationRickard Green
2017-02-20Merge branch 'maint'Hans Nilsson
2017-02-20Merge branch 'hans/ssh/iolist_on_unicode/ERL-364/OTP-14230' into maintHans Nilsson
2017-02-20Merge branch 'maint'Hans Nilsson
2017-02-20Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
2017-02-20Merge branch 'maint'Hans Nilsson
2017-02-20Merge branch 'hans/ssh/sftpd_fixes/OTP-14225' into maintHans Nilsson
2017-02-20kernel: Fail sticky_dir tc if module not stickyLukas Larsson
Running this test when for some reason stdlib has been unstickied could cause the emulator to die. So we check first to make sure that the expected files are sticky.
2017-02-20Documentation: fix link to erlang(3) man pageStephan Renatus
I don't see why this should point to process_flag/2. Let's make it not do that.
2017-02-19ErLLVM: Drop code printing assembly for LLVM < 3.9Magnus Lång
2017-02-19erts: Drop workarounds for ErLLVM w/ LLVM < 3.9Magnus Lång
2017-02-19ErLLVM: Demand LLVM 3.9 or greaterMagnus Lång
2017-02-17ssh: replace byte-only function with element-size agnosticHans Nilsson
An error report on ssh_cli pointed to a usage of erlang:iolist_size/1. It is replaced by a specialized function.
2017-02-17Update primary bootstrapBjörn Gustavsson
2017-02-17Merge branch 'bjorn/fix-make_preload'Björn Gustavsson
* bjorn/fix-make_preload: Teach make_preload to handle the new 'AtU8' chunk
2017-02-17Teach make_preload to handle the new 'AtU8' chunkBjörn Gustavsson
26b59dfe67 introduced the new 'AtU8' chunk to support Unicode atoms. make_preload strips the pre-loaded BEAM files so that they only contain essential chunks. It expects to find the old 'Atom' chunk. Teach make_preload to read the new 'AtU8' chunk instead of the old chunk. Also produce a nice error message if someone by mistake compiles the pre-loaded modules with an OTP 19 compiler.
2017-02-17ssh: increase timetrap in ssh_to_openssh_SUITE to not interrupt some slow ↵Hans Nilsson
machines
2017-02-17Merge branch 'ssh_sftpd_relative_path' into hans/ssh/sftpd_fixes/OTP-14225Hans Nilsson
Conflicts: lib/ssh/test/ssh_sftpd_SUITE.erl
2017-02-17Merge branch 'ssh_sftpd_cwd_with_root' into hans/ssh/sftpd_fixes/OTP-14225Hans Nilsson
Conflicts: lib/ssh/test/ssh_sftpd_SUITE.erl
2017-02-17Merge branch 'hans/ssh/try_sftp_access_outside_root' into ↵Hans Nilsson
hans/ssh/sftpd_fixes/OTP-14225
2017-02-17Merge branch 'bjorn/asn1/clean-up-asn1ct_gen'Björn Gustavsson
* bjorn/asn1/clean-up-asn1ct_gen: asn1ct_gen: Clean up handling of dispatch generation Package abstract code in a record for code generation asn1ct_gen: Polish the file header asn1ct_gen: Clean up generation of .hrl file header asn1ct_gen: Clean up generation records in .hrl file asn1ct_gen: Clean up generation of -export directives asn1ct_gen: Clean up generation of values
2017-02-16Handle magic refs in db_cleanup_offheap_comp()Rickard Green
2017-02-16Merge branch 'maint'Hans Nilsson
2017-02-16Merge branch 'hans/ssh/ssh_acceptor_bug/OTP-14108' into maintHans Nilsson
2017-02-16Merge branch 'maint'Hans Nilsson
2017-02-16Merge branch 'hans/public_key/ssh_fingerprint_algorithm_list/OTP-14223' into ↵Hans Nilsson
maint
2017-02-16Merge branch 'maint'Sverker Eriksson
2017-02-16Merge branch 'sverker/enif_send-noproc-fix/OTP-14229' into maintSverker Eriksson
* sverker/enif_send-noproc-fix: erts: Fix enif_send from noproc and no msg_env
2017-02-16Merge branch 'maint'Sverker Eriksson
2017-02-16Merge branch 'sverker/include-module-literal-size/OTP-14228' into maintSverker Eriksson
* sverker/include-module-literal-size: erts: Add size of literals to module code size