From bbf554a601aad3a63cc6cbf4cc61e1cc777d67eb Mon Sep 17 00:00:00 2001 From: Hans Nilsson Date: Thu, 1 Jun 2017 19:23:57 +0200 Subject: ssh: re-formulate timeouts in ssh_sftp:start_channel --- lib/ssh/doc/src/ssh_sftp.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/ssh/doc/src/ssh_sftp.xml b/lib/ssh/doc/src/ssh_sftp.xml index eb6f43d417..2822bf808f 100644 --- a/lib/ssh/doc/src/ssh_sftp.xml +++ b/lib/ssh/doc/src/ssh_sftp.xml @@ -558,8 +558,14 @@ -

The time-out is passed to the ssh_channel start function, - and defaults to infinity.

+

There are two ways to set a timeout for the underlying ssh connection:

+ + If the connection timeout option connect_timeout is set, that value + is used also for the negotiation timeout and this option (timeout) is ignored. + Otherwise, this option (timeout) is used as the negotiation timeout + only and there is no connection timeout set + +

The value defaults to infinity.

-- cgit v1.2.3