diff options
| author | Micael Karlberg <[email protected]> | 2010-11-29 13:35:01 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2010-11-29 13:35:01 +0100 |
| commit | ad82371b4b6e3c0c1bf29f0a03e8e07941ffacc4 (patch) | |
| tree | 7486b23f0b3b1ce55b83facfe0f86989ad8c659c /lib | |
| parent | 5f1f1ee929a57cc041ebf363f7e6f99f30cb9dea (diff) | |
| download | otp-ad82371b4b6e3c0c1bf29f0a03e8e07941ffacc4.tar.gz otp-ad82371b4b6e3c0c1bf29f0a03e8e07941ffacc4.tar.bz2 otp-ad82371b4b6e3c0c1bf29f0a03e8e07941ffacc4.zip | |
More IPv6 fixing. This time in actual code (in the client).
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/inets/src/http_client/httpc_handler.erl | 16 | ||||
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 10 | ||||
| -rw-r--r-- | lib/inets/test/httpc_SUITE.erl | 5 |
3 files changed, 25 insertions, 6 deletions
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl index 8af6613fa2..fa47ca25db 100644 --- a/lib/inets/src/http_client/httpc_handler.erl +++ b/lib/inets/src/http_client/httpc_handler.erl @@ -854,12 +854,18 @@ connect(SocketType, ToAddress, inet6fb4 -> Opts3 = [inet6 | Opts2], case http_transport:connect(SocketType, ToAddress, Opts3, Timeout) of - {error, Reason} when ((Reason =:= nxdomain) orelse - (Reason =:= eafnosupport)) -> + {error, _Reason} = Error -> Opts4 = [inet | Opts2], - http_transport:connect(SocketType, ToAddress, Opts4, Timeout); - Other -> - Other + case http_transport:connect(SocketType, + ToAddress, Opts4, Timeout) of + {error, _} -> + %% Reply with the "original" error + Error; + OK -> + OK + end; + OK -> + OK end; _ -> Opts3 = [IpFamily | Opts2], diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index 84d8c9278d..0194c65db9 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.5", + [ + {restart_application, inets} + ] + }, {"5.4", [ {restart_application, inets} @@ -29,6 +34,11 @@ [ {restart_application, inets} ] + }, + {"5.4", + [ + {restart_application, inets} + ] } ] }. diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl index 42329a7d47..94d5a48ef6 100644 --- a/lib/inets/test/httpc_SUITE.erl +++ b/lib/inets/test/httpc_SUITE.erl @@ -254,8 +254,11 @@ init_per_testcase(Case, Timeout, Config) -> [{watchdog, Dog}, {local_server, Server} | TmpConfig2] end, + %% httpc:set_options([{proxy, {{?PROXY, ?PROXY_PORT}, + %% ["localhost", ?IPV6_LOCAL_HOST]}}]), + httpc:set_options([{proxy, {{?PROXY, ?PROXY_PORT}, - ["localhost", ?IPV6_LOCAL_HOST]}}, + ["localhost", ?IPV6_LOCAL_HOST]}}, {ipfamily, inet6fb4}]), %% snmp:set_trace([gen_tcp]), |