aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-11-11Merge branch 'maint'Hans Nilsson
* maint: ssh: add better error handling in ssh_file
2015-11-11Merge branch 'hans/ssh/knownhost_loss/OTP-12699' into maintHans Nilsson
* hans/ssh/knownhost_loss/OTP-12699: ssh: add better error handling in ssh_file
2015-11-11Merge branch 'maint'Henrik Nord
2015-11-11Merge branch 'henrik/epmd-ctime' into maintHenrik Nord
* henrik/epmd-ctime: add missing time.h OTP-13095
2015-11-11Merge branch 'gomoripeti/tracedoc_fix' into maintHenrik Nord
* gomoripeti/tracedoc_fix: Fix typo in trace gc_start doc OTP-13094
2015-11-11Merge branch 'legoscia/patch-2' into maintHenrik Nord
* legoscia/patch-2: Remove mention of erlang:fault
2015-11-11Merge branch 'maint'Henrik Nord
2015-11-11Merge branch 'scrapinghub/not_streamed_once' into maintHenrik Nord
* scrapinghub/not_streamed_once: inets: fix {self, once} for not streamed request inets: send correct nonstreamed response with streaming OTP-13093
2015-11-11ssh: add better error handling in ssh_fileHans Nilsson
ssh_file:lookup_user_key_fd and ssh_file:lookup_host_key
2015-11-10Merge branch 'maint'Hans Nilsson
* maint: public_key: update vsn.mk
2015-11-10Merge branch 'hans/public_key/update_vsn.mk' into maintHans Nilsson
* hans/public_key/update_vsn.mk: public_key: update vsn.mk
2015-11-10public_key: update vsn.mkHans Nilsson
2015-11-10Merge branch 'maint'Hans Nilsson
* maint: ssh: use crypto for ecdh point validation
2015-11-10Merge branch 'hans/ssh/compressed_ec_points/OTP-13067' into maintHans Nilsson
* hans/ssh/compressed_ec_points/OTP-13067: ssh: use crypto for ecdh point validation
2015-11-09Merge branch 'maint'Henrik Nord
2015-11-09Merge branch 'kostis/hipe-bs-match-huge-bin' into maintHenrik Nord
* kostis/hipe-bs-match-huge-bin: Fix matching with huge binaries Compile without errors for exported variables OTP-13092
2015-11-09Merge branch 'maint'Henrik Nord
2015-11-09Merge branch 'margnus1/cerl_trees_label_fix' into maintHenrik Nord
* margnus1/cerl_trees_label_fix: Fix cerl_trees:label/2 bug with map K/V swap OTP-13091
2015-11-09ssh: use crypto for ecdh point validationHans Nilsson
2015-11-09Merge branch 'maint'Björn-Egil Dahlberg
2015-11-09Merge branch 'derek121/doc-grammar-and-typos/OTP-13090' into maintBjörn-Egil Dahlberg
* derek121/doc-grammar-and-typos/OTP-13090: Fix typos and grammar
2015-11-06Merge branch 'maint'Hans Nilsson
* maint: ssh: changes after doc review ssh: Document pwdfun ssh: make corrections of keyboard-interactive client ssh: enable users to give option keyboard_interact_fun ssh: pwdfun/4 and simple tests
2015-11-06Merge branch 'hans/ssh/pwdfun/OTP-13055' into maintHans Nilsson
* hans/ssh/pwdfun/OTP-13055: ssh: changes after doc review ssh: Document pwdfun ssh: make corrections of keyboard-interactive client ssh: enable users to give option keyboard_interact_fun ssh: pwdfun/4 and simple tests Conflicts: lib/ssh/doc/src/ssh.xml
2015-11-06Merge branch 'maint'Hans Nilsson
* maint: ssh: correct a bad doc xref public_key: renamed priv/ssh_moduli -> priv/moduli ssh, public_key: updates after doc review ssh: changes after doc review ssh: extend 'dh_gex_limits' to server side ssh: option dh_gex_groups with tag ssh_moduli_file ssh, public_key: random selection of diffie-hellman moduli
2015-11-06Merge branch 'hans/ssh/random_modulus/OTP-13054' into maintHans Nilsson
* hans/ssh/random_modulus/OTP-13054: ssh: correct a bad doc xref public_key: renamed priv/ssh_moduli -> priv/moduli ssh, public_key: updates after doc review ssh: changes after doc review ssh: extend 'dh_gex_limits' to server side ssh: option dh_gex_groups with tag ssh_moduli_file ssh, public_key: random selection of diffie-hellman moduli
2015-11-05ssh: correct a bad doc xrefHans Nilsson
2015-11-05public_key: renamed priv/ssh_moduli -> priv/moduliHans Nilsson
2015-11-05ssh, public_key: updates after doc reviewHans Nilsson
2015-11-05Merge branch 'maint'Henrik Nord
2015-11-05Merge branch 'weiss/case-insensitive-lookups' into maintHenrik Nord
* weiss/case-insensitive-lookups: inet_res: Make host name lookups case-insensitive OTP-13083
2015-11-04Merge branch 'sverk/binary_split_bif'Sverker Eriksson
OTP-13082 * sverk/binary_split_bif: erts: Minor refactor for binary find BIF backend erts: Refactor BIF for binary:match,matches,split erts: Refactor backend of binary:split erts: Replace 0 with THE_NON_VALUE stdlib: Add BIF option 'trim_all' to binary:split/3 stdlib: Add BIF binary:split/2 and binary:split/3 Conflicts: bootstrap/lib/stdlib/ebin/binary.beam
2015-11-04Fix typos and grammarDerek Brown
2015-11-04add missing time.hHenrik Nord
2015-11-04erts: Minor refactor for binary find BIF backendAndrew Bennett
* Use NULL instead of THE_NON_VALUE for non-Eterm variable. * Add BinaryFindState_bignum struct to avoid unnecessary type casting.
2015-11-04erts: Refactor BIF for binary:match,matches,splitAndrew Bennett
with an common do_binary_find() used by match, matches and split.
2015-11-04erts: Refactor backend of binary:splitSverker Eriksson
to reduce code volume.
2015-11-04erts: Replace 0 with THE_NON_VALUESverker Eriksson
2015-11-04stdlib: Add BIF option 'trim_all' to binary:split/3Andrew Bennett
2015-11-04stdlib: Add BIF binary:split/2 and binary:split/3Andrew Bennett
2015-11-04Merge branch 'maint'Hans Bolinder
* maint: [erl_docgen] Correct documentation [dialyzer] Correct documentation [hipe] Correct documentation [test_server] Correct documentation [tools] Correct documentation [erts] Correct documentation [stdlib] Correct documentation [kernel] Correct documentation Conflicts: lib/stdlib/doc/src/erl_scan.xml
2015-11-04Merge branch 'hb/correct_doc_tags' into maintHans Bolinder
* hb/correct_doc_tags: [erl_docgen] Correct documentation [dialyzer] Correct documentation [hipe] Correct documentation [test_server] Correct documentation [tools] Correct documentation [erts] Correct documentation [stdlib] Correct documentation [kernel] Correct documentation
2015-11-04[erl_docgen] Correct documentationHans Bolinder
Fix mistakes found by 'xmllint'.
2015-11-04[dialyzer] Correct documentationHans Bolinder
Fix mistakes found by 'xmllint'.
2015-11-04[hipe] Correct documentationHans Bolinder
Fix mistakes found by 'xmllint'.
2015-11-04[test_server] Correct documentationHans Bolinder
Fix mistakes found by 'xmllint'.
2015-11-04[tools] Correct documentationHans Bolinder
Fix mistakes found by 'xmllint'.
2015-11-04[erts] Correct documentationHans Bolinder
Fix mistakes found by 'xmllint'.
2015-11-04[stdlib] Correct documentationHans Bolinder
Fix mistakes found by 'xmllint'.
2015-11-04[kernel] Correct documentationHans Bolinder
Fix mistakes found by 'xmllint'.
2015-11-04ssh: changes after doc reviewHans Nilsson