[inets] Used invalid transport option for ssl (inet6fb4)

2 files changed, 4 insertions, 10 deletions

diff --git a/lib/inets/test/httpd_mod.erl b/lib/inets/test/httpd_mod.erl
index 25a03ab9c8..23551ab125 100644
--- a/lib/inets/test/httpd_mod.erl
+++ b/lib/inets/test/httpd_mod.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -39,13 +39,6 @@
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
 alias(Type, Port, Host, Node) ->
-    %%     io:format(user, "~w:alias -> entry with"
-%% 	      "~n   Type:       ~p"
-%% 	      "~n   Port:       ~p"
-%% 	      "~n   Host:       ~p"
-%% 	      "~n   Node:       ~p"
-%% 	      "~n", [?MODULE, Type, Port, Host, Node]),    
-
     %% This is very crude, but...
     tsp("alias -> Has IPv6 support: ~p", [inets_test_lib:has_ipv6_support()]),
     Opts = case os:type() of
diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl
index 0c21d6661c..6129607f69 100644
--- a/lib/inets/test/inets_test_lib.erl
+++ b/lib/inets/test/inets_test_lib.erl
@@ -500,8 +500,9 @@ connect(ssl, Host, Port, Opts) ->
 	"~n   Port: ~p"
 	"~n   Opts: ~p", [Host, Port, Opts]),
     ssl:start(),
-    %% Does not support ipv6 in old ssl 
-    case ssl:connect(Host, Port, Opts) of
+    %% We ignore this option for ssl... 
+    %% ...maybe we should really treat this in the same way as ip_comm...
+    case ssl:connect(Host, Port, lists:delete(inet6fb4, Opts)) of
 	{ok, Socket} ->
 	    {ok, Socket};
 	{error, Reason} ->