aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-11-23Merge branch 'maint'Dan Gudmundsson
* maint: win32: Fix mixed cygwin and msys configure tests
2015-11-23Merge branch 'dgud/erts/fix-mixed-msys-cygwin' into maintDan Gudmundsson
* dgud/erts/fix-mixed-msys-cygwin: win32: Fix mixed cygwin and msys configure tests
2015-11-23Merge branch 'maint'Björn-Egil Dahlberg
Conflicts: erts/emulator/beam/external.c
2015-11-23Merge branch 'egil/18/fix-maps-binary_to_term/OTP-13125' into maintBjörn-Egil Dahlberg
* egil/18/fix-maps-binary_to_term/OTP-13125: erts: More testcases for map binary_to_term/1 erts: Fix maps decode in erlang:binary_to_term/1
2015-11-20erts: More testcases for map binary_to_term/1Björn-Egil Dahlberg
2015-11-20erts: Fix maps decode in erlang:binary_to_term/1Björn-Egil Dahlberg
Decoding a term with a large (HAMT) map in an small (FLAT) map could cause a critical error if the external format was not produced by beam.
2015-11-20Merge branch 'maint'Björn Gustavsson
* maint: Fix missing filename and line number in warning Conflicts: lib/compiler/test/bs_match_SUITE.erl
2015-11-20Merge branch 'bjorn/compiler/fix-missing-filename/OTP-13113' into maintBjörn Gustavsson
* bjorn/compiler/fix-missing-filename/OTP-13113: Fix missing filename and line number in warning
2015-11-20Fix missing filename and line number in warningBjörn Gustavsson
When the 'bin_opt_info' is given, warnings without filenames and line numbers could sometimes be produced: no_file: Warning: INFO: matching non-variables after a previous clause matching a variable will prevent delayed sub binary optimization The reason for the missing information is that #c_alias{} records lack location information. There are several ways to fix the problem. The easiest seems to be to get the location information from the code). Noticed-by: José Valim
2015-11-20Merge branch 'maint'Ingela Anderton Andin
2015-11-20Merge branch 'ia/ssl/tls-client-hello-version/OTP-13114' into maintIngela Anderton Andin
* ia/ssl/tls-client-hello-version/OTP-13114: ssl: Client should send the hello message in the lowest version it is willing to support
2015-11-20Merge branch 'maint'Zandra
2015-11-20Merge branch 'weisslj/fix-inets-crash-on-invalid-chunk-size' into maintZandra
* weisslj/fix-inets-crash-on-invalid-chunk-size: inets: Terminate really gracefully on bad chunk OTP-13117
2015-11-20Merge branch 'maint'Zandra
2015-11-20Merge branch 'weisslj/allow-whitespace-after-chunk-size' into maintZandra
* weisslj/allow-whitespace-after-chunk-size: inets: Allow whitespace after HTTP chunk again OTP-13116
2015-11-20Merge branch 'maint'Zandra
2015-11-20Merge branch 'riverrun/maint' into maintZandra
* riverrun/maint: Recommend against using crypto:rand_bytes
2015-11-20Merge branch 'maint'Zandra
2015-11-20Merge branch 'lrascao/fix/vm_crash_on_init_restart' into maintZandra
* lrascao/fix/vm_crash_on_init_restart: Fix crash on init restart OTP-13115
2015-11-19Update primary bootstrapBjörn Gustavsson
2015-11-19Merge branch 'bjorn/cleanup'Björn Gustavsson
* bjorn/cleanup: epp: Only flatten the original filename epp: Modernize the internal data structures epp: Eliminate the Type argument from expand_macros/5 epp: Refactor user_predef/2 to share more code epp: Refactor scan_define() epp: Remove vestigial support for packages epp_SUITE: Improve coverage of epp epp_SUITE: Extend smoke and cover test of format_error/1 epp_SUITE: Add test of -extends()
2015-11-18Merge branch 'maint'Björn Gustavsson
* maint: erl_prim_loader doc: Remove description of custom loaders
2015-11-18Merge branch 'bjorn/erts/erl_prim_loader-doc/OTP-13102' into maintBjörn Gustavsson
* bjorn/erts/erl_prim_loader-doc/OTP-13102: erl_prim_loader doc: Remove description of custom loaders
2015-11-18epp: Only flatten the original filenameBjörn Gustavsson
There is no need to flatten filenames using file_name/1 every time the current filename changes. Any filename obtained from a source file will be already flattened. Only the original source filename may need flattening.
2015-11-18ssl: Client should send the hello message in the lowest version it is ↵Ingela Anderton Andin
willing to support Refactor highest_protocol_version so that code is symmetrical with lowest_protocol_version. For clarity and possible future use cases of highest_protocol_version/2
2015-11-18Merge branch 'maint'Hans Bolinder
* maint: [crypto] Correct documentation [compiler] Correct documentation [ssh] Correct documentation [snmp] Correct documentation [eunit] Correct documentation
2015-11-17[crypto] Correct documentationHans Bolinder
Fix mistakes found by 'xmllint'.
2015-11-17[compiler] Correct documentationHans Bolinder
Fix mistakes found by 'xmllint'.
2015-11-17[ssh] Correct documentationHans Bolinder
Fix mistakes found by 'xmllint'.
2015-11-17[snmp] Correct documentationHans Bolinder
Fix mistakes found by 'xmllint'.
2015-11-17[eunit] Correct documentationHans Bolinder
Fix mistakes found by 'xmllint'.
2015-11-17epp: Modernize the internal data structuresBjörn Gustavsson
Use maps instead of 'dict'. Remove the {atom,MacroName} wrappers that were used for historical reasons.
2015-11-17Merge branch 'maint'Zandra
2015-11-17Merge branch 'legoscia/heart-remove-obsolete-comment' into maintZandra
* legoscia/heart-remove-obsolete-comment: Remove obsolete comment in heart.c
2015-11-17Merge branch 'maint'Zandra
2015-11-17Merge branch 'evnu/fix-whitespace-splitting' into maintZandra
* evnu/fix-whitespace-splitting: Fix erroneous splitting of emulator path
2015-11-17Merge branch 'maint'Hans Nilsson
* maint: ssh: alternative look ssh: list supported rfcs ssh: moved "supported" section from ssh module man page to SSH_app man page ssh: links to crypto and public_key in the ssh app ref ssh: updated ssh_app.xml with ecdsa info ssh: removed pre-historic ssh specs from the doc-dir ssh: document function dependencies in ssh_connection.erl
2015-11-17Merge branch 'hans/ssh/doc_updates/OTP-12003' into maintHans Nilsson
* hans/ssh/doc_updates/OTP-12003: ssh: alternative look ssh: list supported rfcs ssh: moved "supported" section from ssh module man page to SSH_app man page ssh: links to crypto and public_key in the ssh app ref ssh: updated ssh_app.xml with ecdsa info ssh: removed pre-historic ssh specs from the doc-dir ssh: document function dependencies in ssh_connection.erl
2015-11-17Merge branch 'maint'Hans Nilsson
* maint: ssh: Add env var info printout to ssh_algorithms_SUTE:init_per_suite ssh: more public keys added to test suite
2015-11-17Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
* hans/ssh/cuddle_tests: ssh: Add env var info printout to ssh_algorithms_SUTE:init_per_suite ssh: more public keys added to test suite
2015-11-17Merge branch 'maint'Hans Nilsson
* maint: ssh: ssh_file:default_user_dir/0 - try HOME env var first
2015-11-17Merge branch 'hans/ssh/sshdir_search_order/OTP-13109' into maintHans Nilsson
* hans/ssh/sshdir_search_order/OTP-13109: ssh: ssh_file:default_user_dir/0 - try HOME env var first
2015-11-17epp: Eliminate the Type argument from expand_macros/5Björn Gustavsson
The Type argument is always 'atom', so there is no need for the argument.
2015-11-17epp: Refactor user_predef/2 to share more codeBjörn Gustavsson
2015-11-17epp: Refactor scan_define()Björn Gustavsson
Refactor scan_define() in order to share more between macros without any arguments and macros with arguments.
2015-11-17epp: Remove vestigial support for packagesBjörn Gustavsson
Packages were removed in 34d865a7dfdb33 (R16), but the 'epp' module was forgotten.
2015-11-17epp_SUITE: Improve coverage of eppBjörn Gustavsson
2015-11-17epp_SUITE: Extend smoke and cover test of format_error/1Björn Gustavsson
30a4adb7 added smoke and cover test of format_error/1, but did not catch calls that went through check/2.
2015-11-16epp_SUITE: Add test of -extends()Björn Gustavsson
2015-11-16Merge branch 'maint'Sverker Eriksson