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/test | |
| 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/test')
| -rw-r--r-- | lib/inets/test/inets_test_lib.erl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl index 6cedaf9638..57e5d482c9 100644 --- a/lib/inets/test/inets_test_lib.erl +++ b/lib/inets/test/inets_test_lib.erl @@ -303,7 +303,7 @@ connect_byte(ossl, Host, Port) -> connect_byte(essl, Host, Port) -> connect(ssl, Host, Port, [{ssl_imp, new}, {packet,0}]); connect_byte(ip_comm, Host, Port) -> - Opts = [inet6, {packet,0}], + Opts = [inet6, {packet, 0}], connect(ip_comm, Host, Port, Opts). @@ -327,10 +327,13 @@ connect(ip_comm, Host, Port, Opts) -> tsp("nxdomain opts: ~p", [Opts]), connect(ip_comm, Host, Port, lists:delete(inet6, Opts)); {error, eafnosupport} -> - tsp("eafnosupport opts: ~p", [Opts]), + tsp("eafnosupport when opts: ~p", [Opts]), + connect(ip_comm, Host, Port, lists:delete(inet6, Opts)); + {error, econnreset} -> + tsp("econnreset when opts: ~p", [Opts]), connect(ip_comm, Host, Port, lists:delete(inet6, Opts)); {error, enetunreach} -> - tsp("eafnosupport opts: ~p", [Opts]), + tsp("eafnosupport when opts: ~p", [Opts]), connect(ip_comm, Host, Port, lists:delete(inet6, Opts)); {error, {enfile,_}} -> tsp("Error enfile"), |