diff options
| author | Micael Karlberg <[email protected]> | 2011-06-28 16:51:30 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-06-28 16:51:30 +0200 |
| commit | 7492a31ce78e61d36713e4e88ac06fcc7ca9ddf7 (patch) | |
| tree | 720d872abcb4354492d3c957b1c8a64990fda12f /lib/inets/src/ftp/ftp.erl | |
| parent | 80afe2b50aa5479e1e53dd7ba01e540df6351781 (diff) | |
| parent | 9cb4040e4aeed40a52f174a7c4d9106e38572605 (diff) | |
| download | otp-7492a31ce78e61d36713e4e88ac06fcc7ca9ddf7.tar.gz otp-7492a31ce78e61d36713e4e88ac06fcc7ca9ddf7.tar.bz2 otp-7492a31ce78e61d36713e4e88ac06fcc7ca9ddf7.zip | |
Merge branch 'maint-r14' into dev
Diffstat (limited to 'lib/inets/src/ftp/ftp.erl')
| -rw-r--r-- | lib/inets/src/ftp/ftp.erl | 4 |
1 files changed, 3 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}]), |