aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh
AgeCommit message (Collapse)Author
2015-03-16Revert "Use new time API and be back-compatible in ssh"Erland Schönbeck
This reverts commit af972aaf14a5f53510e692f48f672f7e6805ee6d. Conflicts: lib/ssh/test/ssh_basic_SUITE.erl
2015-03-16ssh: uppdate version in vsn.mkHans Nilsson
2015-03-12Merge branch 'shijiang1130/master' into maintZandra Hird
* shijiang1130/master: Add client example for using the SSH module OTP-12558
2015-03-06Add client example for using the SSH moduleLinus.yuan
2015-03-05Update misleading comment in ssh_basic_SUITEErland Schönbeck
2015-03-02Update new time API and be back-compatible in sshErland Schönbeck
2015-02-25Use new time API and be back-compatible in sshErland Schönbeck
otp_SUITE: Ignore undefined functions in ssh
2015-02-05Fix ssh:connect erroneus error msg at timeoutHans Nilsson
2015-01-26Merge branch 'ia/ssh/sftp-v3-flags' into maintIngela Anderton Andin
* ia/ssh/sftp-v3-flags: ssh: Add some more flags ssh: Correct Sftp flag handling ssh: Add handling of sftp v3 flags
2015-01-23ssh: Add some more flagsIngela Anderton Andin
2015-01-23ssh: Correct Sftp flag handlingIngela Anderton Andin
Function name was somewhat confusing and when trying to find a better name for it we realised it did not work as intended.
2015-01-23ssh: Add handling of sftp v3 flagsIngela Anderton Andin
2015-01-19fix spellingMarcus Arendt
2015-01-13fix doc typos found by Rabbe FogelholmMarcus Arendt
2014-12-17ssh: Improve errorhandling in ssh_connection.erlIngela Anderton Andin
If a channel is closed by the peer while using a function with call semantics in ssh_connection.erl return {error, closed}. Document that the functions can return {error, timeout | closed} and not only ssh_request_status()
2014-12-17Merge branch 'marcus/revert-ssh-testcase2/OTP-12004' into maintMarcus Arendt
* marcus/revert-ssh-testcase2/OTP-12004: fix failed conflict resolution
2014-12-10fix failed conflict resolutionMarcus Arendt
2014-12-09Prepare releaseErlang/OTP
2014-12-09Merge remote-tracking branch 'upstream/maint' into maintHans Nilsson
2014-12-09ssh: Fix syntax error in .appupHans Nilsson
2014-12-09revert ssh testcaseMarcus Arendt
2014-12-08ssh: Fix .app and .appupHans Nilsson
2014-12-05Revert "ssh: Corrected ret val from ssh_connection:subsystem/4."Marcus Arendt
This reverts commit d086394ebd3595d431835af80709977a6c1c7c89.
2014-12-02ssh: Add soft upgrade for ptty_allocIngela Anderton Andin
2014-12-02ssh: Fixes wrong version in appup fileHans Nilsson
2014-12-01ssh: prepares appup file for releaseHans Nilsson
2014-12-01ssh: Implements and tests erl_tar read from remote host.Hans Nilsson
2014-12-01ssh: crypto framework for ssh_sftp:open_tar addedHans Nilsson
2014-12-01Merge branch 'ia/ssh/gracefull-termination/OTP-12185' into maintIngela Anderton Andin
* ia/ssh/gracefull-termination/OTP-12185: ssh: Gracefully handle bad input
2014-11-18ssh: Gracefully handle bad inputIngela Anderton Andin
2014-11-18ssh: update vsn.mkHans Nilsson
2014-11-18ssh: Add ssh_sftp:open_tar/3,4 which opens a tar file at the server side of ↵Hans Nilsson
a channel. Depends on erl_tar.erl having the function erl_tar:init/3 defined.
2014-11-12Merge branch 'dotsimon/ssh_connect_timeout/OTP-12306' into maintMarcus Arendt
* dotsimon/ssh_connect_timeout/OTP-12306: Fix ssh_sftp:start_channel timeout
2014-11-04Merge branch 'ia/ssh/rekeying-typo/OTP-12277' into maintIngela Anderton Andin
* ia/ssh/rekeying-typo/OTP-12277: ssh: Correct typo of renegotiate that could cause rekeying to fail
2014-10-30Merge branch 'ia/ssh/pty-request/OTP-11542' into maintIngela Anderton Andin
* ia/ssh/pty-request/OTP-11542: ssh: Add basic ptty_alloc tests ssh: Add pty_alloc request to ssh:shell/[1,2,3] ssh: Add ptty_alloc/[2,3]
2014-10-30ssh: Correct typo of renegotiate that could cause rekeying to failIngela Anderton Andin
2014-10-29ssh: Add basic ptty_alloc testsIngela Anderton Andin
2014-10-24Fix ssh_sftp:start_channel timeoutSimon Cornish
The {timeout, Timeout} option passed to ssh_sftp:start_channel is not applied to the early phases of the SSH protocol. For example, if the remote server fails to respond after the "hello" then the call will hang for as long as the server keeps the TCP connection alive. This patch passes the Timeout through to ssh:connect. In case the timeout occurs during these phases, {error, timeout} is returned.
2014-10-23Merge branch 'maint-17' into maintHenrik Nord
Conflicts: OTP_VERSION
2014-10-23Update release notesErlang/OTP
2014-10-23ssh: fix ssh.appup.src.Hans Nilsson
2014-10-23ssh: Corrected appupIngela Anderton Andin
2014-10-22ssh: fix .app and .appup errorsHans Nilsson
2014-10-22ssh: remove supervisors for crashed connection workerHans Nilsson
2014-10-22ssh: Print supervisor tree (on demand).Hans Nilsson
2014-10-22Merge branch 'HansN/prop_test_updates' into maintBruce Yinhe
OTP-12256 * HansN/prop_test_updates: Optimizations ssh_eqc_encode_decode.erl compiles Add timeout to a property test (Thanks John & Tobias @ QuviQ) Reduce the total testing time for the properties to 20 seconds No side effects in function arguments Passing global var to QuickCheck statemachine
2014-10-22ssh: Add pty_alloc request to ssh:shell/[1,2,3]Ingela Anderton Andin
2014-10-22ssh: Add ptty_alloc/[2,3]Ingela Anderton Andin
2014-10-21ssh: prepare for releaseHans Nilsson
2014-10-21ssh: avoid terminated but not deleted children to be counted.Hans Nilsson