diff options
| author | Marcus Arendt <[email protected]> | 2014-11-12 10:04:17 +0100 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-11-12 10:04:17 +0100 |
| commit | 30e5a5b28f3f4c5ba69d536aec30d1fae4e1f2fb (patch) | |
| tree | 381d067b5ac2ce905afc8e7270c9a8037adcefa7 /lib/ssh/src/ssh_sftp.erl | |
| parent | 8f32884f7301064d2a45a50854892cdc966e3048 (diff) | |
| parent | e61f384adff0c9b134750ee239581296d25c10cd (diff) | |
| download | otp-30e5a5b28f3f4c5ba69d536aec30d1fae4e1f2fb.tar.gz otp-30e5a5b28f3f4c5ba69d536aec30d1fae4e1f2fb.tar.bz2 otp-30e5a5b28f3f4c5ba69d536aec30d1fae4e1f2fb.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssh/src/ssh_sftp.erl')
| -rw-r--r-- | lib/ssh/src/ssh_sftp.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_sftp.erl b/lib/ssh/src/ssh_sftp.erl index 721146c509..12479e9121 100644 --- a/lib/ssh/src/ssh_sftp.erl +++ b/lib/ssh/src/ssh_sftp.erl @@ -112,7 +112,7 @@ start_channel(Host, Opts) -> start_channel(Host, Port, Opts) -> {SshOpts, SftpOpts} = handle_options(Opts, [], []), Timeout = proplists:get_value(timeout, SftpOpts, infinity), - case ssh_xfer:connect(Host, Port, SshOpts) of + case ssh_xfer:connect(Host, Port, SshOpts, Timeout) of {ok, ChannelId, Cm} -> case ssh_channel:start(Cm, ChannelId, ?MODULE, [Cm, ChannelId, SftpOpts]) of |