diff options
| author | Micael Karlberg <[email protected]> | 2011-05-27 16:34:41 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-05-27 16:34:41 +0200 |
| commit | 7cdf5fc1ca658f826ed92019bca474c66206d96c (patch) | |
| tree | a640d80fe9c5ab8430b056bd9a8fbb3957ecd1c1 /lib/inets/src | |
| parent | 4a5a75811e2cd590b5c94f71864a5245fd511ccf (diff) | |
| download | otp-7cdf5fc1ca658f826ed92019bca474c66206d96c.tar.gz otp-7cdf5fc1ca658f826ed92019bca474c66206d96c.tar.bz2 otp-7cdf5fc1ca658f826ed92019bca474c66206d96c.zip | |
OTP-9342: FTP client doesn't work with IPv6
OTP-9342: IpFamily config option was not handled
OTP-9342: Release notes remain...
OTP-9342: <credit>attila rajmund nohl</credit>
Diffstat (limited to 'lib/inets/src')
| -rw-r--r-- | lib/inets/src/ftp/ftp.erl | 4 | ||||
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/lib/inets/src/ftp/ftp.erl b/lib/inets/src/ftp/ftp.erl index fe6cb0c191..ac72963347 100644 --- a/lib/inets/src/ftp/ftp.erl +++ b/lib/inets/src/ftp/ftp.erl @@ -1038,10 +1038,12 @@ handle_call({_, {open, ip_comm, Opts}}, From, State) -> Port = key_search(port, Opts, ?FTP_PORT), Timeout = key_search(timeout, Opts, ?CONNECTION_TIMEOUT), Progress = key_search(progress, Opts, ignore), + IpFamily = key_search(ipfamily, Opts, inet), State2 = State#state{client = From, mode = Mode, - progress = progress(Progress)}, + progress = progress(Progress), + ipfamily = IpFamily}, ?fcrd("handle_call(open) -> setup ctrl connection with", [{host, Host}, {port, Port}, {timeout, Timeout}]), diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index 47f3fbba58..09356caa22 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -18,6 +18,11 @@ {"%VSN%", [ + {"5.6", + [ + {update, ftp, soft, soft_purge, soft_purge, []} + ] + }, {"5.5.2", [ {restart_application, inets} @@ -40,6 +45,11 @@ } ], [ + {"5.6", + [ + {update, ftp, soft, soft_purge, soft_purge, []} + ] + }, {"5.5.2", [ {restart_application, inets} |