diff options
| author | Micael Karlberg <[email protected]> | 2011-09-19 14:30:09 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-09-19 14:30:09 +0200 |
| commit | 3f9de4601b8539eea14de2d1517f54956e05d03a (patch) | |
| tree | 58188efd5694f0f4aeec258eea69612581e09f9e /lib/inets/doc/src/notes.xml | |
| parent | 4b8958c0397765bd208dbf0dd297c654ed0c33d1 (diff) | |
| parent | 724ae2b149b60063ff140f58d9d9a86f2fd93048 (diff) | |
| download | otp-3f9de4601b8539eea14de2d1517f54956e05d03a.tar.gz otp-3f9de4601b8539eea14de2d1517f54956e05d03a.tar.bz2 otp-3f9de4601b8539eea14de2d1517f54956e05d03a.zip | |
Merge branch 'bmk/inets/ftp/data_connect_timeout/OTP-9545' into bmk/inets/inets58_integration
Diffstat (limited to 'lib/inets/doc/src/notes.xml')
| -rw-r--r-- | lib/inets/doc/src/notes.xml | 13 |
1 files changed, 9 insertions, 4 deletions
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 @@ <section><title>Inets 5.8</title> <section><title>Improvements and New Features</title> +<!-- <p>-</p> +--> -<!-- <list> <item> - <p>[httpc|httpd] Added support for IPv6 with ssl. </p> - <p>Own Id: OTP-5566</p> + <p>[ftpc] Add a config option to specify a + <seealso marker="ftp#dtimeout">data connect timeout</seealso>. + 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. </p> + <p>Own Id: OTP-9545</p> </item> </list> ---> </section> |