aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-11-26Merge branch 'maint'Zandra
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 'maint'Hans Nilsson
* maint: 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/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 'maint'Hans Nilsson
* maint: 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 '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 'maint'Zandra
2015-11-24Merge branch 'tuncer/musl' into maintZandra
* tuncer/musl: musl: fix gethostbyname_r/gethostbyaddr_ selection
2015-11-24Merge branch 'maint'Zandra
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-23Merge branch 'np/sharing-preserved-copy/OTP-12590'Björn-Egil Dahlberg
* np/sharing-preserved-copy/OTP-12590: (28 commits) Refactor have seq_trace token test Use sharing preserving copy error messages and exceptions Use sharing preserving copy in enif_make_copy Refactor sharing preserved copy flags Fix rebase of SHCOPY seq_tokens Fix erts_debug:copy_shared/1 prototype Update preloaded module erlang.beam Add erlang:copy_literals/2 spec Add copy_literals testcase Do not use GCC extensions in copy Use copy literal range check in message passing and purging Add BIF for setting internal copy literal range Copy literals in copy sharing Refactor copy sharing Add support for HAMT maps in preserved copy Fix Map preserved sharing copy implementation Fix Halfword removal Fix internal stacks Add support for maps in preserved copy Add --enable-sharing-preserving configure flag ...
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 '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-20ssh: testcases for starting daemon with given fdHans Nilsson
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-19Refactor have seq_trace token testBjörn-Egil Dahlberg
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-19ssh: Make it possible for more than one daemon started with option fdHans Nilsson
2015-11-18Use sharing preserving copy error messages and exceptionsBjörn-Egil Dahlberg
2015-11-18Use sharing preserving copy in enif_make_copyBjörn-Egil Dahlberg
2015-11-18Refactor sharing preserved copy flagsBjörn-Egil Dahlberg
The TMPBUF option is no longer needed due to is_literal test and NONE was only used for initial debugging. So we remove the entire option.
2015-11-18Fix rebase of SHCOPY seq_tokensBjörn-Egil Dahlberg
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-17Fix erts_debug:copy_shared/1 prototypeBjörn-Egil Dahlberg