From 724ae2b149b60063ff140f58d9d9a86f2fd93048 Mon Sep 17 00:00:00 2001 From: Micael Karlberg Date: Mon, 19 Sep 2011 14:28:06 +0200 Subject: [ftpc] Add a config option to specify a data connect timeout. That is how long the ftp client will wait for the server to connect to the data socket. If this timeout occurs, an error will be returned to the caller and the ftp client process will be terminated. OTP-9545 --- lib/inets/doc/src/ftp.xml | 21 ++++++++++++++++----- lib/inets/doc/src/notes.xml | 13 +++++++++---- 2 files changed, 25 insertions(+), 9 deletions(-) (limited to 'lib/inets/doc/src') diff --git a/lib/inets/doc/src/ftp.xml b/lib/inets/doc/src/ftp.xml index ca902d8d9d..f8f11ec705 100644 --- a/lib/inets/doc/src/ftp.xml +++ b/lib/inets/doc/src/ftp.xml @@ -1,10 +1,10 @@ - +
- 19972010 + 19972011 Ericsson AB. All Rights Reserved. @@ -141,11 +141,21 @@ {timeout, Timeout} -

Timeout = integer() >= 0

+

Timeout = non_neg_integer()

Connection timeout.

Default is 60000 (milliseconds).

+ {dtimeout, DTimeout} + + +

DTimeout = non_neg_integer() | infinity

+

Data Connect timeout. + The time the client will wait for the server to connect to the + data socket.

+

Default is infinity.

+
+ {progress, Progress} @@ -542,11 +552,12 @@ verbose() = boolean() (defaults to false) debug() = disable | debug | trace (defaults to disable) - open_option() = {ipfamily, ipfamily()} | {port, port()} | {mode, mode()} | {timeout, timeout()} | {progress, progress()} + open_option() = {ipfamily, ipfamily()} | {port, port()} | {mode, mode()} | {timeout, timeout()} | {dtimeout, dtimeout()} | {progress, progress()} ipfamily() = inet | inet6 | inet6fb4 (defaults to inet) port() = integer() > 0 (defaults to 21) mode() = active | passive (defaults to passive) - timeout() = integer() >= 0 (defaults to 60000 milliseconds) + timeout() = integer() > 0 (defaults to 60000 milliseconds) + dtimeout() = integer() > 0 | infinity (defaults to infinity) pogress() = ignore | {module(), function(), initial_data()} (defaults to ignore) module() = atom() function() = atom() diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index c53aa653d8..061c8aa87c 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -35,17 +35,22 @@
Inets 5.8
Improvements and New Features + -
-- cgit v1.2.3