diff options
| author | Micael Karlberg <[email protected]> | 2011-06-15 16:48:20 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-06-15 16:48:20 +0200 |
| commit | 9d4dd02d9faf0e2a8d51b0b9a033b888afb98a0e (patch) | |
| tree | 11a17aba8a96c928511f01ed11d1bffe020a67aa /lib/inets/src | |
| parent | 704ed1824308f16e0de67c6ff1eae7e80d38232f (diff) | |
| parent | dfaf00eb4fb11cdb8470401c47b15d8068b9f8cd (diff) | |
| download | otp-9d4dd02d9faf0e2a8d51b0b9a033b888afb98a0e.tar.gz otp-9d4dd02d9faf0e2a8d51b0b9a033b888afb98a0e.tar.bz2 otp-9d4dd02d9faf0e2a8d51b0b9a033b888afb98a0e.zip | |
[ftp] FTP client doesn't work with IPv6 host.
Attila Rajmund Nohl
OTP-9342
Merge branch 'bmk/inets/ftp/does_not_handle_ipv6/OTP-9342' into bmk/inets/inets57_integration2
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/inets_app/inets.appup.src
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 | 6 |
2 files changed, 7 insertions, 3 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 c432ac82eb..4aa53ae581 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -20,7 +20,8 @@ [ {"5.6", [ - {load_module, http_transport, soft_purge, soft_purge, []} + {load_module, http_transport, soft_purge, soft_purge, []}, + {update, ftp, soft, soft_purge, soft_purge, []} ] }, {"5.5.2", @@ -47,7 +48,8 @@ [ {"5.6", [ - {load_module, http_transport, soft_purge, soft_purge, []} + {load_module, http_transport, soft_purge, soft_purge, []}, + {update, ftp, soft, soft_purge, soft_purge, []} ] }, {"5.5.2", |