aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-17Fix EVP_aes_???_ctr to demand OpenSSL 1.0.1 or later.Sverker Eriksson
2015-11-17Fix bug for aes_cfb_128_encrypt with empty binarySverker Eriksson
causing OpenSSL 0.9.8h to crash with evp_enc.c(282): OpenSSL internal error, assertion failed: inl > 0
2015-11-17crypto: Refactor nif code to use EVP interfaceSverker Eriksson
Using the generic EVP_* API makes it possible to unify algorithm-specific nif functions to a single generic function. Effectively the same change that took place on the Erlang API in R16B01 is now applied to the C code. The old implementation using the low-level API is kept for compiling against old OpenSSL, as parts of the EVP API were introduced in OpenSSL 1.0.0. There are various minor improvements as well: - supported algorithms are now provided by the nif code (not a mix of the C and Erlang code) - remove unnecessary variables and macro definitions Most of the changes in this commit comes from Dániel Szoboszlay https://github.com/dszoboszlay/otp/commit/07f7056f955b324df4ace which is part of his 'fips' branch. Now also rebased on master branch.
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-17jinterface: fix writing small compressed valuesNico Kruber
This is a regression of 4390e43558 in the OtpOutputStream class. We can not call java.util.zip.DeflaterOutputStream.close() in the finally block of the OtpOutputStream.write_compressed(OtpErlangObject, int) method. This leads to a NullPointerException when encoding "{}" which is caused by the DeflaterOutputStream trying to write bytes to the deflater which was "destroyed" by calling java.util.zip.Deflater.end(). Further possibilities to call close() in the finally block are not suitable either (see the comment in the source). This leaves no choice but to revert the change from 4390e43558 in this class (and add an appropriate test case).
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
2015-11-16Merge branch 'sverk/nif_SUITE-win64-long-bug' into maintSverker Eriksson
* sverk/nif_SUITE-win64-long-bug: erts: Fix nif_SUITE for win64
2015-11-16erts: Add garbage_collection_info to process_info/2Lukas Larsson
This info request returns greater details about the current gc state. This info is not included in the default process_info/1 as it would clutter the default printout with too much information.
2015-11-16Merge branch 'sverk/binary-split-bug'Sverker Eriksson
* sverk/binary-split-bug: stdlib: Fix bug in binary:split for empty binary
2015-11-16fix 24h macro in test suiteZandra
Needed after the fix in 120975c4fcb57ecd14031ac046f483e56a3daa4d.
2015-11-16An implementation of lightweight unbounded queuesNikolaos S. Papaspyrou
2015-11-16Update primary bootstrapBjörn Gustavsson
2015-11-16Merge branch 'bjorn/cleanup'Björn Gustavsson
* bjorn/cleanup: beam_validator: Don't allow an 'undefined' entry label in a function beam_validator: Remove obsolete DEBUG support v3_kernel: Speed up compilation of modules with many funs beam_dict: Speed up storage of funs beam_asm: Speed up assembly for modules with many exports sys_core_dsetel: Use a map instead of a dict sys_pre_expand: Cover coerce_to_float/2 Cover code for callbacks in sys_pre_expand Cover sys_pre_expand:pattern/2 sys_pre_expand: Remove uncovered clause in pat_bit_size/2 sys_pre_expand: Clean up data structures sys_pre_expand: Remove vestiges of variable usage tracking sys_pre_expand: Remove imports of ordsets functions sys_pre_expand: Remove unnecessary inclusion of erl_bits.hrl io: Make a fast code path for i/o requests
2015-11-16beam_validator: Don't allow an 'undefined' entry label in a functionBjörn Gustavsson
Before 912fea0b beam_validator could validate disassembled files. That's probably why the entry label was allowed to be 'undefined'.
2015-11-16beam_validator: Remove obsolete DEBUG supportBjörn Gustavsson
No one has used the debug support in many years. Also, the debug support is not free. There are calls to lists:foreach/2 that will be executed even when debug support is turned off.
2015-11-16Merge branch 'maint'Henrik Nord
2015-11-16Merge branch 'c-rack/fix-typo-prim-inet' into maintHenrik Nord
* c-rack/fix-typo-prim-inet: Fix minor typo "timout" -> "timeout"
2015-11-16Merge branch 'zenhack/fix-erroneous-__uint32_t' into maintHenrik Nord
* zenhack/fix-erroneous-__uint32_t: Fix erroneous use of __uint32_t OTP-13105
2015-11-16Merge branch 'deadok22/jinterface-input-stream-read-any-etf-113' into maintHenrik Nord
* deadok22/jinterface-input-stream-read-any-etf-113: OtpInputStream: external fun terms in read_any() OTP-13106
2015-11-16Merge branch 'legoscia/erl-make-exit-code' into maintHenrik Nord
* legoscia/erl-make-exit-code: Make erl -make return non-zero exit code on failure OTP-13107
2015-11-16Merge branch 'kanatohodets/ssh-subsystem-typo' into maintHenrik Nord
* kanatohodets/ssh-subsystem-typo: Fix spelling of ssh 'subsystem' OTP-13108
2015-11-16Merge branch 'lucafavatella/dialyzer-remote-type'Henrik Nord
* lucafavatella/dialyzer-remote-type: Delete remote types-related dead code in erl_types OTP-13104
2015-11-16erl_prim_loader doc: Remove description of custom loadersBjörn Gustavsson
Custom loaders have not been supported for several releases. Remove the documentation for custom loaders.
2015-11-15inets: Terminate really gracefully on bad chunkJohannes Weißl
Without this fix, httpc:request/1 crashes the httpc_handler when an invalid chunked length header is encountered (since 77acb47): =ERROR REPORT==== 14-Nov-2015::17:19:30 === ** Generic server <0.651.0> terminating ** Last message in was {tcp,#Port<0.5714>, <<"HTTP/1.1 200 ok\r\nTransfer-Encoding:chunked\r\n\r\nåäö\r\n">>} ** When Server state == {state, [...] ** Reason for termination == ** {bad_return_value,{error,{chunk_size,"åäö"}}}
2015-11-15inets: Allow whitespace after HTTP chunk againJohannes Weißl
Before 77acb47 http:request/1 could parse server responses with whitespace after the HTTP chunk size (some embedded legacy devices still do this). This patch restores this functionality.
2015-11-14musl: fix gethostbyname_r/gethostbyaddr_ selectionTuncer Ayaz
To fix conditional selection of the actually available gethostbyname_r and gethostbyaddr_r, we replace __GLIBC__ with __linux__. @zenhack tested this to work with gcc and clang targeting glibc, uclibc, musl, and bionic. The proper way to check this is through configure.in.
2015-11-14hipe_x86_signal: add support for musl libcMikael Pettersson
- change #if tests at default Solaris case to explicitly check for __sun__ - add new default case, instantiate it for musl
2015-11-13stdlib: Fix bug in binary:split for empty binarySverker Eriksson
Bug introduced om master branch at b93e9b611056828a and reported in ERL-43.
2015-11-13Add test for dist_nodelay optionMagnus Henoch
Run the 'basic' test with dist_nodelay set to false.
2015-11-13ssh: ssh_file:default_user_dir/0 - try HOME env var firstHans Nilsson
2015-11-13ssh: Add env var info printout to ssh_algorithms_SUTE:init_per_suiteHans Nilsson
2015-11-13ssh: more public keys added to test suiteHans Nilsson
2015-11-13ssh: alternative lookHans Nilsson
2015-11-13Merge branch 'maint'Zandra