More IPv6 fixing. This time in actual code (in the client).

etnt · Nov 29, 2010 · ad82371 · ad82371
1 parent 5f1f1ee
commit ad82371
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git 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
@@ -18,13 +18,23 @@
 
 {"%VSN%",
  [
+  {"5.5",
+   [
+    {restart_application, inets}
+   ]
+  }, 
   {"5.4",
    [
     {restart_application, inets}
    ]
   } 
  ],
  [	
+  {"5.4",
+   [
+    {restart_application, inets}
+   ]
+  },     
   {"5.4",
    [
     {restart_application, inets}

diff --git 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]),