aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-11-26Merge branch 'legoscia/tls_dist_nodelay' into maintZandra
* legoscia/tls_dist_nodelay: Add test for dist_nodelay option Honour dist_nodelay socket option in tls_dist proxy OTP-13143
2015-11-26Merge branch 'legoscia/ssl-dist-error-handling' into maintZandra
* legoscia/ssl-dist-error-handling: In ssl_tls_dist_proxy, pass along EPMD registration errors OTP-13142
2015-11-26Merge branch 'zandra/fix-24h-macro-in-suite' into maintZandra
* zandra/fix-24h-macro-in-suite: fix 24h macro in test suite
2015-11-26Merge branch 'ppikula/fix-24h-macro' into maintZandra
* ppikula/fix-24h-macro: fix incorrect number of seconds in 24h macro The previous commit - 7b93f5d8a224a0a076a420294c95a666a763ee60 fixed the macro only in one place. OTP-13141
2015-11-24Merge branch 'hans/ssh/fd_more/OTP-12966' into maintHans Nilsson
* hans/ssh/fd_more/OTP-12966: ssh: testcases for starting daemon with given fd ssh: Make it possible for more than one daemon started with option fd
2015-11-24Merge branch 'hans/ssh/aes_gcm_crypto/OTP-13018' into maintHans Nilsson
* hans/ssh/aes_gcm_crypto/OTP-13018: ssh: fix dialyzer reported error ssh: renegotiate test group for AES_GCM ssh: documentation updates ssh: AEAD_AES_(128|256)_GCM and aes(128|256)[email protected] crypto ssh: refactor packet reception
2015-11-24Merge branch 'tuncer/musl' into maintZandra
* tuncer/musl: musl: fix gethostbyname_r/gethostbyaddr_ selection
2015-11-24Merge branch 'legoscia/tls-dist-shutdown' into maintZandra
* legoscia/tls-dist-shutdown: Adjust shutdown strategies for distribution over TLS OTP-13134
2015-11-23ssh: fix dialyzer reported errorHans Nilsson
2015-11-23ssh: renegotiate test group for AES_GCMHans Nilsson
2015-11-23ssh: documentation updatesHans Nilsson
2015-11-23ssh: AEAD_AES_(128|256)_GCM and aes(128|256)[email protected] cryptoHans Nilsson
Note that the rfc5647 is ambigous so this implementation of AEAD_AES_(128|256)_GCM may or may not be compatible with others. They are note enabled by default but may be enabled by the user. See the Reference Manual, Application SSH for details of how we interpret the rfc. To be safe, use [email protected] or [email protected] instead.
2015-11-23ssh: refactor packet receptionHans Nilsson
There was an assymetric relationship between receiving a ssh-packet (decrypting-mac-decompress) and sending one. When sending, most of the work was defined in the ssh_transport module, while at reception the ssh_connection_handler was the one knowing what to do. This commit moves the reception down to the ssh_transport module where it belongs.
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 '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 '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-20ssh: testcases for starting daemon with given fdHans Nilsson
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 '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 '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 'riverrun/maint' into maintZandra
* riverrun/maint: Recommend against using crypto:rand_bytes
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-19ssh: Make it possible for more than one daemon started with option fdHans Nilsson
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-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-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-17Merge branch 'legoscia/heart-remove-obsolete-comment' into maintZandra
* legoscia/heart-remove-obsolete-comment: Remove obsolete comment in heart.c
2015-11-17Merge branch 'evnu/fix-whitespace-splitting' into maintZandra
* evnu/fix-whitespace-splitting: Fix erroneous splitting of emulator path
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 '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 '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-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-16fix 24h macro in test suiteZandra
Needed after the fix in 120975c4fcb57ecd14031ac046f483e56a3daa4d.
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-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-13Add test for dist_nodelay optionMagnus Henoch
Run the 'basic' test with dist_nodelay set to false.