aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-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-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 'zandra/snmp-appup' into maintZandra
* zandra/snmp-appup: add a soft upgrade instruction to the snmp appup
2015-11-13Merge branch 'zhird/johnheizenberg/snmp_config_check_imask_bugfix' into maintZandra
* zhird/johnheizenberg/snmp_config_check_imask_bugfix: fix snmp_conf check imask bug OTP-13101
2015-11-13Merge branch 'maint-18' into maintZandra
2015-11-12erts: Fix nif_SUITE for win64Sverker Eriksson
where type long is only 32-bit and can not hold a pointer unless your lucky.
2015-11-12Updated OTP versionOTP-18.1.4Erlang/OTP
2015-11-12Update release notesErlang/OTP
2015-11-12Merge branch ↵Erlang/OTP
'ia/maint-18/inets/httpd-chunk-length-handling/OTP-13061/nodelay/OTP-13062' into maint-18 * ia/maint-18/inets/httpd-chunk-length-handling/OTP-13061/nodelay/OTP-13062: inets: Prepare for release inets: Do not use internal or shell convenience functions in application Inets: Clean up code inets: httpd - Add possibility to specify socket options for HTTP inets: Remove debug macros that mimic call trace inets: Improve max header size handling inets: CT'ify http_format_SUITE inets: Terminate gracfully when an invalid chunked length header is encountered
2015-11-11ssh: list supported rfcsHans Nilsson
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-11ssh: moved "supported" section from ssh module man page to SSH_app man pageHans Nilsson
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-11inets: Prepare for releaseIngela Anderton Andin
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-11inets: Do not use internal or shell convenience functions in applicationIngela Anderton Andin
ssl:start/[1,2] is a shell convenience function and should not be called by other applications. inet_db:start is an internal function that we should not have to call. This was done for legacy reasons and is no longer needed.
2015-11-11Inets: Clean up codeIngela Anderton Andin
Remove point less instructions looking for return values, that in most cases no long exist, of which the result would anyhow be ignored
2015-11-11inets: httpd - Add possibility to specify socket options for HTTPIngela Anderton Andin
Was already possible for HTTPS. Also remove use of legacy option inet6fb4. IPv6 standard moved away from beeing able to fallback to IPv4 so this option makes little sense, will use inet (Ipv4) as default instead of inet6fb4.
2015-11-11inets: Remove debug macros that mimic call traceIngela Anderton Andin
2015-11-11inets: Improve max header size handlingIngela Anderton Andin
The chunked length header should be checked as well as headers present in the chunk trailer part, ignored extensions are counted as header bytes. Also the decode trailer function will stop as soon as the header size is exceed, when that happens.
2015-11-11inets: CT'ify http_format_SUITEIngela Anderton Andin
2015-11-11inets: Terminate gracfully when an invalid chunked length header is encounteredIngela Anderton Andin
Also use integer_to_list/2 and list_to_integer/2 instead of reimplementing it.
2015-11-11ssh: links to crypto and public_key in the ssh app refHans Nilsson
2015-11-11ssh: updated ssh_app.xml with ecdsa infoHans Nilsson
2015-11-11ssh: removed pre-historic ssh specs from the doc-dirHans Nilsson
2015-11-11ssh: document function dependencies in ssh_connection.erlHans Nilsson
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 '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 '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 '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 '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 '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-06add a soft upgrade instruction to the snmp appupZandra
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