diff options
| author | Anders Svensson <[email protected]> | 2011-08-16 17:01:45 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2011-08-16 17:01:45 +0200 |
| commit | a7c0e439ee84d25ce18f65959be06315063a7de8 (patch) | |
| tree | b5a54174171fdd0f10d556c8a96909eb4af7f1d6 /lib/inets/src/ftp/ftp.erl | |
| parent | 5a57f3798edd56caa61514378c673ff78ac397d2 (diff) | |
| parent | 46af29aac0e851105620dab25644cf27219e2b0a (diff) | |
| download | otp-a7c0e439ee84d25ce18f65959be06315063a7de8.tar.gz otp-a7c0e439ee84d25ce18f65959be06315063a7de8.tar.bz2 otp-a7c0e439ee84d25ce18f65959be06315063a7de8.zip | |
Merge remote branch 'upstream/dev' 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}]), |