Merge branch 'bmk/inets/httpc/checking_ipv6_on_windows' into bmk/inets/inets59_integration

7 files changed, 372 insertions, 182 deletions

diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 881266b70a..734964698e 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -156,6 +156,9 @@ groups() ->
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
+
+    ?PRINT_SYSTEM_INFO([]),
+
     PrivDir = ?config(priv_dir, Config),
     DataDir = ?config(data_dir, Config),
     ServerRoot = filename:join(PrivDir, "server_root"),
@@ -179,10 +182,11 @@ init_per_suite(Config) ->
     {ok, FileInfo} = file:read_file_info(Cgi),
     ok = file:write_file_info(Cgi, FileInfo#file_info{mode = 8#00755}),
 
-    [{server_root,    ServerRoot}, 
-     {doc_root,       DocRoot},
-     {local_port,     ?IP_PORT}, 
-     {local_ssl_port, ?SSL_PORT} | Config].
+    [{has_ipv6_support, inets_test_lib:has_ipv6_support()}, 
+     {server_root,      ServerRoot}, 
+     {doc_root,         DocRoot},
+     {local_port,       ?IP_PORT}, 
+     {local_ssl_port,   ?SSL_PORT} | Config].
 
 
 %%--------------------------------------------------------------------
@@ -198,6 +202,7 @@ end_per_suite(Config) ->
     application:stop(ssl),
     ok.
 
+
 %%--------------------------------------------------------------------
 %% Function: init_per_testcase(Case, Config) -> Config
 %% Case - atom()
@@ -244,6 +249,7 @@ init_per_testcase(Case, Timeout, Config) ->
     io:format(user, 
 	      "~n~n*** INIT ~w:~w[~w] ***"
 	      "~n~n", [?MODULE, Case, Timeout]),
+
     PrivDir = ?config(priv_dir, Config),
     application:stop(inets),
     Dog         = test_server:timetrap(inets_test_lib:minutes(Timeout)),
@@ -355,6 +361,18 @@ init_per_testcase(Case, Timeout, Config) ->
 		end;
 
 	    _ -> 
+		%% Try inet6fb4 on windows...
+		tsp("init_per_testcase -> allways try IPv6 on windows"),
+		?RUN_ON_WINDOWS(
+		   fun() -> 
+			   tsp("init_per_testcase:set_options_fun -> "
+			       "set-option ipfamily to inet6fb4"),
+			   Res = httpc:set_options([{ipfamily, inet6fb4}]),
+ 			   tsp("init_per_testcase:set_options_fun -> "
+			       "~n   Res: ~p", [Res]),
+			   Res
+		   end),
+
 		TmpConfig2 = lists:keydelete(local_server, 1, TmpConfig),
 		%% Will start inets 
 		Server = start_http_server(PrivDir, IpConfFile),
@@ -367,6 +385,9 @@ init_per_testcase(Case, Timeout, Config) ->
     inets:enable_trace(max, io, httpc),
     %% inets:enable_trace(max, io, all),
     %% snmp:set_trace([gen_tcp]),
+    tsp("init_per_testcase(~w) -> done when"
+	"~n   NewConfig:  ~p"
+	"~n~n", [Case, NewConfig]),
     NewConfig.
 
 
@@ -456,22 +477,32 @@ http_head(doc) ->
 http_head(suite) ->
     [];
 http_head(Config) when is_list(Config) ->
-    case ?config(local_server, Config) of 
-	ok ->
-	    Port = ?config(local_port, Config),
-	    URL = ?URL_START ++ integer_to_list(Port) ++ "/dummy.html",
-	    case httpc:request(head, {URL, []}, [], []) of
-		{ok, {{_,200,_}, [_ | _], []}} ->
-		    ok;
-		{ok, WrongReply} ->
-		    tsf({wrong_reply, WrongReply});
-		Error ->
-		    tsf({failed, Error})
-	    end;
-	  _ ->
-	      {skip, "Failed to start local http-server"}
-      end.  
+    tsp("http_head -> entry with"
+	"~n   Config: ~p", [Config]),
+    Method   = head, 
+    Port     = ?config(local_port, Config),
+    URL      = ?URL_START ++ integer_to_list(Port) ++ "/dummy.html",
+    Request  = {URL, []}, 
+    HttpOpts = [], 
+    Opts     = [], 
+    VerifyResult = 
+	fun({ok, {{_,200,_}, [_ | _], []}}) ->
+		ok;
+	   ({ok, UnexpectedReply}) ->
+		tsp("http_head:verify_fun -> Unexpected Reply: "
+		    "~n   ~p", [UnexpectedReply]),
+		tsf({unexpected_reply, UnexpectedReply});
+	   ({error, Reason} = Error) ->
+		tsp("http_head:verify_fun -> Error reply: "
+		    "~n   Reason: ~p", [Reason]),
+		tsf({bad_reply, Error})
+	end,
+    simple_request_and_verify(Config, 
+			      Method, Request, HttpOpts, Opts, VerifyResult).
+
+
 %%-------------------------------------------------------------------------
+
 http_get(doc) ->
     ["Test http get request against local server"];
 http_get(suite) ->
@@ -488,7 +519,8 @@ http_get(Config) when is_list(Config) ->
 	    Request      = {URL, []}, 
 	    Timeout      = timer:seconds(1), 
 	    ConnTimeout  = Timeout + timer:seconds(1), 
-	    HttpOptions1 = [{timeout, Timeout}, {connect_timeout, ConnTimeout}], 
+	    HttpOptions1 = [{timeout,         Timeout}, 
+			    {connect_timeout, ConnTimeout}], 
 	    Options1     = [], 
 	    Body = 
 		case httpc:request(Method, Request, HttpOptions1, Options1) of
@@ -520,10 +552,11 @@ http_get(Config) when is_list(Config) ->
     end.  
 
 %%-------------------------------------------------------------------------
+
 http_post(doc) ->
-    ["Test http post request against local server. We do in this case"
-    " only care about the client side of the the post. The server"
-    " script will not actually use the post data."];
+    ["Test http post request against local server. We do in this case "
+     "only care about the client side of the the post. The server "
+     "script will not actually use the post data."];
 http_post(suite) ->
     [];
 http_post(Config) when is_list(Config) ->
@@ -1136,9 +1169,20 @@ ssl_get(SslTag, Config) when is_list(Config) ->
 		"~n   URL:        ~p"
 		"~n   SslTag:     ~p"
 		"~n   SSLOptions: ~p", [URL, SslTag, SSLOptions]),
-	    {ok, {{_,200, _}, [_ | _], Body = [_ | _]}} =
-		httpc:request(get, {URL, []}, [{ssl, SSLConfig}], []),
-	    inets_test_lib:check_body(Body);
+	    case httpc:request(get, {URL, []}, [{ssl, SSLConfig}], []) of
+		{ok, {{_,200, _}, [_ | _], Body = [_ | _]}} ->
+		    inets_test_lib:check_body(Body),
+		    ok;
+		{ok, {StatusLine, Headers, _Body}} ->
+		    tsp("ssl_get -> unexpected result: "
+			"~n   StatusLine: ~p"
+			"~n   Headers:    ~p", [StatusLine, Headers]),
+		    tsf({unexpected_response, StatusLine, Headers});
+		{error, Reason} ->
+		    tsp("ssl_get -> request failed: "
+			"~n   Reason: ~p", [Reason]),
+		    tsf({request_failed, Reason})
+	    end;
 	 {ok, _} ->
 	    {skip, "local http-server not started"}; 
 	 _ ->
@@ -3813,6 +3857,34 @@ pick_header(Headers, Name) ->
 	    Val
     end.
 
+
+%% -------------------------------------------------------------------------
+
+simple_request_and_verify(Config, 
+			  Method, Request, HttpOpts, Opts, VerifyResult) 
+  when (is_list(Config) andalso 
+	is_atom(Method) andalso 
+	is_list(HttpOpts) andalso 
+	is_list(Opts) andalso 
+	is_function(VerifyResult, 1)) ->
+    tsp("request_and_verify -> entry with"
+	"~n   Method:   ~p"
+	"~n   Request:  ~p"
+	"~n   HttpOpts: ~p"
+	"~n   Opts:     ~p", [Method, Request, HttpOpts, Opts]),
+    case ?config(local_server, Config) of
+	ok ->
+	    tsp("request_and_verify -> local-server running"),
+	    Result = (catch httpc:request(Method, Request, HttpOpts, Opts)),
+	    VerifyResult(Result);
+	_ ->
+	    tsp("request_and_verify -> local-server *not* running - skip"),
+	    hard_skip("Local http-server not running")
+    end.
+
+
+
+
 not_implemented_yet() ->
     exit(not_implemented_yet).
 
@@ -3864,6 +3936,8 @@ dummy_ssl_server_hang_loop(_) ->
 	    ok
     end.
 
+hard_skip(Reason) ->
+    throw(skip(Reason)).
 
 skip(Reason) ->
     {skip, Reason}.
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index a4bb8f7159..907d58fd8c 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -314,6 +314,8 @@ init_per_suite(Config) ->
 	      "~n   Config: ~p"
 	      "~n", [Config]),
 
+    ?PRINT_SYSTEM_INFO([]),
+
     PrivDir = ?config(priv_dir, Config),
     SuiteTopDir = filename:join(PrivDir, ?MODULE),
     case file:make_dir(SuiteTopDir) of
@@ -325,10 +327,11 @@ init_per_suite(Config) ->
             throw({error, {failed_creating_suite_top_dir, Error}})
     end,
 
-    [{suite_top_dir, SuiteTopDir},
-     {node,          node()},
-     {host,          inets_test_lib:hostname()},
-     {address,       getaddr()} | Config].
+    [{has_ipv6_support, inets_test_lib:has_ipv6_support()}, 
+     {suite_top_dir,    SuiteTopDir},
+     {node,             node()},
+     {host,             inets_test_lib:hostname()},
+     {address,          getaddr()} | Config].
 
 
 %%--------------------------------------------------------------------
@@ -363,10 +366,9 @@ init_per_testcase(Case, Config) ->
 
 init_per_testcase2(Case, Config) ->
 
-    io:format(user, "~w:init_per_testcase2(~w) -> entry with"
-	      "~n   Config: ~p"
-	      "~n", [?MODULE, Case, Config]),
-
+    tsp("init_per_testcase2(~w) -> entry with"
+	"~n   Config: ~p", [Case, Config]),
+    
     IpNormal    = integer_to_list(?IP_PORT)    ++ ".conf",
     IpHtaccess  = integer_to_list(?IP_PORT)   ++ "htaccess.conf",
     SslNormal   = integer_to_list(?SSL_PORT)  ++ ".conf",
@@ -375,39 +377,33 @@ init_per_testcase2(Case, Config) ->
     DataDir     = ?config(data_dir, Config),
     SuiteTopDir = ?config(suite_top_dir, Config),
 
-    io:format(user, "~w:init_per_testcase2(~w) -> "
-	      "~n   SuiteDir: ~p"
-	      "~n   DataDir: ~p"
-	      "~n", [?MODULE, Case, SuiteTopDir, DataDir]),
+    tsp("init_per_testcase2(~w) -> "
+	"~n   SuiteDir: ~p"
+	"~n   DataDir:  ~p", [Case, SuiteTopDir, DataDir]),
     
     TcTopDir = filename:join(SuiteTopDir, Case),
     ?line ok = file:make_dir(TcTopDir),
 
-    io:format(user, "~w:init_per_testcase2(~w) -> "
-	      "~n   TcTopDir: ~p"
-	      "~n", [?MODULE, Case, TcTopDir]),
+    tsp("init_per_testcase2(~w) -> "
+	"~n   TcTopDir: ~p", [Case, TcTopDir]),
 
     DataSrc    = filename:join([DataDir, "server_root"]),
     ServerRoot = filename:join([TcTopDir, "server_root"]),
     
-    io:format(user, "~w:init_per_testcase2(~w) -> "
-	      "~n   DataSrc: ~p"
-	      "~n   ServerRoot: ~p"
-	      "~n", [?MODULE, Case, DataSrc, ServerRoot]),
+    tsp("init_per_testcase2(~w) -> "
+	"~n   DataSrc:    ~p"
+	"~n   ServerRoot: ~p", [Case, DataSrc, ServerRoot]),
 
     ok = file:make_dir(ServerRoot),
     ok = file:make_dir(filename:join([TcTopDir, "logs"])),
 
     NewConfig = [{tc_top_dir, TcTopDir}, {server_root, ServerRoot} | Config],
 
-    io:format(user, "~w:init_per_testcase2(~w) -> "
-	      "copy DataSrc to ServerRoot~n", 
-	      [?MODULE, Case]),
+    tsp("init_per_testcase2(~w) -> copy DataSrc to ServerRoot", [Case]),
 
     inets_test_lib:copy_dirs(DataSrc, ServerRoot),
 
-    io:format(user, "~w:init_per_testcase2(~w) -> fix cgi~n", 
-	      [?MODULE, Case]),
+    tsp("init_per_testcase2(~w) -> fix cgi", [Case]),
     EnvCGI =  filename:join([ServerRoot, "cgi-bin", "printenv.sh"]),
     {ok, FileInfo} = file:read_file_info(EnvCGI),
     ok = file:write_file_info(EnvCGI, 
@@ -427,16 +423,14 @@ init_per_testcase2(Case, Config) ->
 			      FileInfo1#file_info{mode = 8#00755}),
     
     %% To be used by IP test cases
-    io:format(user, "~w:init_per_testcase2(~w) -> ip testcase setups~n", 
-	      [?MODULE, Case]),
+    tsp("init_per_testcase2(~w) -> ip testcase setups", [Case]),
     create_config([{port, ?IP_PORT}, {sock_type, ip_comm} | NewConfig], 
 		  normal_access, IpNormal), 
     create_config([{port, ?IP_PORT}, {sock_type, ip_comm} | NewConfig], 
     		  mod_htaccess, IpHtaccess), 
 
     %% To be used by SSL test cases
-    io:format(user, "~w:init_per_testcase2(~w) -> ssl testcase setups~n", 
-	      [?MODULE, Case]),
+    tsp("init_per_testcase2(~w) -> ssl testcase setups", [Case]),
     SocketType = 
 	case atom_to_list(Case) of
 	    [X, $s, $s, $l | _] ->
@@ -460,8 +454,7 @@ init_per_testcase2(Case, Config) ->
     %% when you run the whole test suite due  to shortcomings
     %% of the test server.
 
-    io:format(user, "~w:init_per_testcase2(~w) -> "
-	      "maybe generate IPv6 config file(s)", [?MODULE, Case]),
+    tsp("init_per_testcase2(~w) -> maybe generate IPv6 config file(s)", [Case]),
     NewConfig2 = 
 	case atom_to_list(Case) of
 	    "ipv6_" ++ _ ->
@@ -502,15 +495,15 @@ init_per_testcase2(Case, Config) ->
 		NewConfig
 	end,
 
-    io:format(user, "~w:init_per_testcase2(~w) -> done~n", 
-	      [?MODULE, Case]),
+    tsp("init_per_testcase2(~w) -> done when"
+	"~n   NewConfig2: ~p", [Case, NewConfig2]),
 
     NewConfig2.
 
 
 init_per_testcase3(Case, Config) ->
-    io:format(user, "~w:init_per_testcase3(~w) -> entry with"
-	      "~n   Config: ~p", [?MODULE, Case, Config]),
+    tsp("init_per_testcase3(~w) -> entry with"
+	"~n   Config: ~p", [Case, Config]),
 
     
 %%     %% Create a new fresh node to be used by the server in this test-case
@@ -532,12 +525,10 @@ init_per_testcase3(Case, Config) ->
     %% Set trace level
     case lists:reverse(atom_to_list(Case)) of
 	"tset_emit" ++ _Rest -> % test-cases ending with time_test
-	    io:format(user, "~w:init_per_testcase3(~w) -> disabling trace", 
-		      [?MODULE, Case]),
+	    tsp("init_per_testcase3(~w) -> disabling trace", [Case]),
 	    inets:disable_trace();
 	_ ->
-	    io:format(user, "~w:init_per_testcase3(~w) -> enabling trace", 
-		      [?MODULE, Case]),
+	    tsp("init_per_testcase3(~w) -> enabling trace", [Case]),
 	    %% TraceLevel = 70, 
 	    TraceLevel = max, 
 	    TraceDest  = io, 
@@ -545,8 +536,7 @@ init_per_testcase3(Case, Config) ->
     end,
 	    
     %% Start initialization
-    io:format(user, "~w:init_per_testcase3(~w) -> start init", 
-	      [?MODULE, Case]),
+    tsp("init_per_testcase3(~w) -> start init", [Case]),
     
 
     Dog = test_server:timetrap(inets_test_lib:minutes(10)),
@@ -627,26 +617,32 @@ init_per_testcase3(Case, Config) ->
 		end
 	end,
 
-    case CaseRest of
-	{skip, _} = Skip ->
-	    Skip;
-	"mod_auth_" ++ _ ->
-	    start_mnesia(?config(node, Config)),
-	    [{watchdog, Dog} | NewConfig];
-	"mod_htaccess" ->
-	    ServerRoot = ?config(server_root, Config), 
-	    Path = filename:join([ServerRoot, "htdocs"]),
-	    catch remove_htaccess(Path),
-	    create_htaccess_data(Path, ?config(address, Config)),
-	    [{watchdog, Dog} | NewConfig];
-	"range" ->
-	    ServerRoot = ?config(server_root, Config), 
-	    Path = filename:join([ServerRoot, "htdocs"]),
-	    create_range_data(Path),
-	    [{watchdog, Dog} | NewConfig];
-	_ ->
-	    [{watchdog, Dog} | NewConfig]
-    end.
+    InitRes = 
+	case CaseRest of
+	    {skip, _} = Skip ->
+		Skip;
+	    "mod_auth_" ++ _ ->
+		start_mnesia(?config(node, Config)),
+		[{watchdog, Dog} | NewConfig];
+	    "mod_htaccess" ->
+		ServerRoot = ?config(server_root, Config), 
+		Path = filename:join([ServerRoot, "htdocs"]),
+		catch remove_htaccess(Path),
+		create_htaccess_data(Path, ?config(address, Config)),
+		[{watchdog, Dog} | NewConfig];
+	    "range" ->
+		ServerRoot = ?config(server_root, Config), 
+		Path = filename:join([ServerRoot, "htdocs"]),
+		create_range_data(Path),
+		[{watchdog, Dog} | NewConfig];
+	    _ ->
+		[{watchdog, Dog} | NewConfig]
+	end,
+    
+    tsp("init_per_testcase3(~w) -> done when"
+	"~n   InitRes: ~p", [Case, InitRes]),
+
+    InitRes.
 
 
 %%--------------------------------------------------------------------
@@ -664,16 +660,14 @@ end_per_testcase(Case, Config) ->
     ok.
 
 end_per_testcase2(Case, Config) ->
-    io:format(user, "~w:end_per_testcase2(~w) -> entry with"
-	      "~n   Config: ~p~n", 
-	      [?MODULE, Case, Config]),
+    tsp("end_per_testcase2(~w) -> entry with"
+	"~n   Config: ~p", [Case, Config]),
     application:unset_env(inets, services),
     application:stop(inets),
     application:stop(ssl),     
     application:stop(crypto), % used by the new ssl (essl test cases)  
     cleanup_mnesia(),
-    io:format(user, "~w:end_per_testcase2(~w) -> done~n", 
-	      [?MODULE, Case]),
+    tsp("end_per_testcase2(~w) -> done", [Case]),
     ok.
 
 
diff --git a/lib/inets/test/httpd_basic_SUITE.erl b/lib/inets/test/httpd_basic_SUITE.erl
index 4cd38f2ec4..be0bcc67d5 100644
--- a/lib/inets/test/httpd_basic_SUITE.erl
+++ b/lib/inets/test/httpd_basic_SUITE.erl
@@ -202,8 +202,8 @@ escaped_url_in_error_body(Config) when is_list(Config) ->
 	{ok, {200, _}} ->
 	    %% Don't care about the the body, just that we get a ok response
 	    ok;
-	{ok, UnexpectedOK1} ->
-	    tsf({unexpected_ok_1, UnexpectedOK1})
+	{ok, {StatusCode1, Body1}} ->
+	    tsf({unexpected_ok_1, StatusCode1, Body1})
     end,
 
     %% Request 2
@@ -216,8 +216,8 @@ escaped_url_in_error_body(Config) when is_list(Config) ->
 	{ok, {200, _}} ->
 	    %% Don't care about the the body, just that we get a ok response
 	    ok;
-	{ok, UnexpectedOK2} ->
-	    tsf({unexpected_ok_2, UnexpectedOK2})
+	{ok, {StatusCode2, Body2}} ->
+	    tsf({unexpected_ok_2, StatusCode2, Body2})
     end,
 
     %% Request 3
@@ -238,7 +238,7 @@ escaped_url_in_error_body(Config) when is_list(Config) ->
 		    tsf({unexpected_path_3, HTMLEncodedPath, BadPath3})
 	    end;
 	{ok, UnexpectedOK3} ->
-	    tsf({unexpected_ok_1, UnexpectedOK3})
+	    tsf({unexpected_ok_3, UnexpectedOK3})
     end,
 
     %% Request 4
@@ -253,7 +253,7 @@ escaped_url_in_error_body(Config) when is_list(Config) ->
 		HTMLEncodedPath ->
 		    ok;
 		BadPath4 ->
-		    tsf({unexpected_path_2, HTMLEncodedPath, BadPath4})
+		    tsf({unexpected_path_4, HTMLEncodedPath, BadPath4})
 	    end;
 	{ok, UnexpectedOK4} ->
 	    tsf({unexpected_ok_4, UnexpectedOK4})
diff --git a/lib/inets/test/httpd_mod.erl b/lib/inets/test/httpd_mod.erl
index 5016cdb9e6..25a03ab9c8 100644
--- a/lib/inets/test/httpd_mod.erl
+++ b/lib/inets/test/httpd_mod.erl
@@ -39,14 +39,24 @@
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
 alias(Type, Port, Host, Node) ->
-%%     io:format(user, "~w:alias -> entry with"
+    %%     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]),    
-    
-    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
+
+    %% This is very crude, but...
+    tsp("alias -> Has IPv6 support: ~p", [inets_test_lib:has_ipv6_support()]),
+    Opts = case os:type() of
+	       {win32, _} ->
+		   [inet6fb4];
+	       _ ->
+		   []
+	   end,
+    tsp("alias -> Opts: ~p", [Opts]),
+
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Opts, Node, 
  				       "GET /pics/icon.sheet.gif "
  				       "HTTP/1.0\r\n\r\n",
  				       [{statuscode, 200},
@@ -55,7 +65,7 @@ alias(Type, Port, Host, Node) ->
  					{header, "Date"},
  				        {version, "HTTP/1.0"}]),
     
-     ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Opts, Node, 
  				       "GET / HTTP/1.0\r\n\r\n",
  				       [{statuscode, 200},
  					{header, "Content-Type","text/html"},
@@ -63,7 +73,7 @@ alias(Type, Port, Host, Node) ->
  					{header, "Date"},
  				        {version, "HTTP/1.0"}]),
 
-     ok = httpd_test_lib:verify_request(Type,Host,Port,Node, 
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Opts, Node, 
  				       "GET /misc/ HTTP/1.0\r\n\r\n",
  				       [{statuscode, 200},
  					{header, "Content-Type","text/html"},
@@ -71,8 +81,8 @@ alias(Type, Port, Host, Node) ->
  					{header, "Date"},
  				        {version, "HTTP/1.0"}]),
 
-     %% Check redirection if trailing slash is missing.
-     ok = httpd_test_lib:verify_request(Type,Host,Port,Node, 
+    %% Check redirection if trailing slash is missing.
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Opts, Node, 
  				       "GET /misc HTTP/1.0\r\n\r\n",
  				       [{statuscode, 301},
  					{header, "Location"},
@@ -1032,9 +1042,10 @@ check_lists_members1(L1,L2) ->
 
 
 %% tsp(F) ->
-%%     tsp(F, []).
-%% tsp(F, A) ->
-%%     test_server:format("~p ~p:" ++ F ++ "~n", [self(), ?MODULE | A]).
+%%     inets_test_lib:tsp(F).
+tsp(F, A) ->
+    inets_test_lib:tsp(F, A).
+
 
 tsf(Reason) ->
     test_server:fail(Reason).
diff --git a/lib/inets/test/httpd_test_lib.erl b/lib/inets/test/httpd_test_lib.erl
index 2f5867559a..ed6ee315b3 100644
--- a/lib/inets/test/httpd_test_lib.erl
+++ b/lib/inets/test/httpd_test_lib.erl
@@ -79,19 +79,19 @@
 %%--------------------------------------------------------------------
 %% API
 %%------------------------------------------------------------------
+
 verify_request(SocketType, Host, Port, Node, RequestStr, Options) ->
-    verify_request(SocketType, Host, Port, Node, RequestStr, 
-		   Options, 30000).
+    verify_request(SocketType, Host, Port, Node, RequestStr, Options, 30000).
+
 verify_request(SocketType, Host, Port, TranspOpts, Node, RequestStr, Options) 
   when is_list(TranspOpts) ->
-    verify_request(SocketType, Host, Port, TranspOpts, Node, RequestStr, 
-		   Options, 30000);
+    verify_request(SocketType, Host, Port, TranspOpts, Node, RequestStr, Options, 30000);
+
 verify_request(SocketType, Host, Port, Node, RequestStr, Options, TimeOut) 
   when (is_integer(TimeOut) orelse (TimeOut =:= infinity)) ->
-    verify_request(SocketType, Host, Port, [], Node, RequestStr, 
-		   Options, TimeOut).
-verify_request(SocketType, Host, Port, TranspOpts, Node, RequestStr, 
-	       Options, TimeOut) ->
+    verify_request(SocketType, Host, Port, [], Node, RequestStr, Options, TimeOut).
+
+verify_request(SocketType, Host, Port, TranspOpts, Node, RequestStr, Options, TimeOut) ->
     tsp("verify_request -> entry with"
 	"~n   SocketType: ~p"
 	"~n   Host:       ~p"
@@ -117,15 +117,15 @@ verify_request(SocketType, Host, Port, TranspOpts, Node, RequestStr,
 	    case request(State#state{request = RequestStr, 
 				     socket  = Socket}, TimeOut) of
 		{error, Reason} ->
-		    tsp("request failed: "
+		    tsp("verify_request -> request failed: "
 			"~n   Reason: ~p", [Reason]),
 		    {error, Reason};
 		NewState ->
-		    tsp("validate reply: "
+		    tsp("verify_request -> validate reply: "
 			"~n   NewState: ~p", [NewState]),
 		    ValidateResult = 
 			validate(RequestStr, NewState, Options, Node, Port),
-		    tsp("validation result: "
+		    tsp("verify_request -> validation result: "
 			"~n   ~p", [ValidateResult]),
 		    inets_test_lib:close(SocketType, Socket),
 		    ValidateResult
diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl
index bbed35e1f8..b03127691d 100644
--- a/lib/inets/test/inets_test_lib.erl
+++ b/lib/inets/test/inets_test_lib.erl
@@ -34,39 +34,45 @@
 -export([tsp/1, tsp/2, tsf/1]).
 -export([check_body/1]).
 -export([millis/0, millis_diff/2, hours/1, minutes/1, seconds/1, sleep/1]).
--export([oscmd/1, has_ipv6_support/1]).
+-export([oscmd/1, has_ipv6_support/0, has_ipv6_support/1, print_system_info/1]).
+-export([run_on_os/2, run_on_windows/1]).
 -export([ensure_started/1]).
 -export([non_pc_tc_maybe_skip/4, os_based_skip/1, skip/3, fail/3]).
 -export([flush/0]).
 -export([start_node/1, stop_node/1]).
 
+
 %% -- Misc os command and stuff
 
+has_ipv6_support() ->
+    tsp("has_ipv6_support -> no ipv6_hosts config"),
+    {ok, Hostname} = inet:gethostname(),
+    case inet:getaddrs(Hostname, inet6) of
+	{ok, [Addr|_]} when is_tuple(Addr) andalso 
+			    (element(1, Addr) =/= 0) ->
+	    %% We actually need to test that the addr can be used, 
+	    %% this is done by attempting to create a (tcp) 
+	    %% listen socket
+	    tsp("has_ipv6_support -> check Addr: ~p", [Addr]),
+	    case (catch gen_tcp:listen(0, [inet6, {ip, Addr}])) of
+		{ok, LSock} ->
+		    tsp("has_ipv6_support -> we are ipv6 host"),
+		    gen_tcp:close(LSock),
+		    {ok, Addr};
+		_ ->
+		    undefined
+	    end;
+	_ ->
+	    undefined
+    end.
+    
 has_ipv6_support(Config) ->
     case lists:keysearch(ipv6_hosts, 1, Config) of
 	false ->
 	    %% Do a basic check to se if 
 	    %% our own host has a working IPv6 address...
-	    tsp("has_ipv6_support -> no ipv6_hosts config"),
-	    {ok, Hostname} = inet:gethostname(),
-	    case inet:getaddrs(Hostname, inet6) of
-		{ok, [Addr|_]} when is_tuple(Addr) andalso 
-				    (element(1, Addr) =/= 0) ->
-		    %% We actually need to test that the addr can be used, 
-		    %% this is done by attempting to create a (tcp) 
-		    %% listen socket
-		    tsp("has_ipv6_support -> check Addr: ~p", [Addr]),
-		    case (catch gen_tcp:listen(0, [inet6, {ip, Addr}])) of
-			{ok, LSock} ->
-			    tsp("has_ipv6_support -> we are ipv6 host"),
-			    gen_tcp:close(LSock),
-			    {ok, Addr};
-			_ ->
-			    undefined
-		    end;
-		_ ->
-		    undefined
-	    end;
+	    has_ipv6_support();
+
 	{value, {_, Hosts}} when is_list(Hosts) ->
 	    %% Check if our host is in the list of *known* IPv6 hosts
 	    tsp("has_ipv6_support -> Hosts: ~p", [Hosts]),
@@ -88,6 +94,49 @@ has_ipv6_support(Config) ->
 oscmd(Cmd) ->
   string:strip(os:cmd(Cmd), right, $\n).
 
+
+print_system_info([]) ->
+    do_print_system_info("System Info");
+print_system_info(Prefix) when is_list(Prefix) ->
+    NewPrefix = lists:flatten(io_lib:format("~s: System Info", [Prefix])), 
+    do_print_system_info(NewPrefix).
+
+do_print_system_info(Prefix) ->
+    tsp("~s => "
+	"~n"
+	"~n   OS Type:            ~p"
+	"~n   OS version:         ~p"
+	"~n   Sys Arch:           ~p"
+	"~n   CPU Topology:       ~p"
+	"~n   Num logical procs:  ~p"
+	"~n   SMP support:        ~p"
+	"~n   Num schedulers:     ~p"
+	"~n   Scheduler bindings: ~p"
+	"~n   Wordsize:           ~p"
+	"~n~n", [Prefix, 
+		 os:type(), os:version(), 
+		 erlang:system_info(system_architecture),
+		 erlang:system_info(cpu_topology),
+		 erlang:system_info(logical_processors),
+		 erlang:system_info(smp_support),
+		 erlang:system_info(schedulers),
+		 erlang:system_info(scheduler_bindings),
+		 erlang:system_info(wordsize)]),
+    ok.
+    
+    
+run_on_windows(Fun) ->
+    run_on_os(windows, Fun).
+
+run_on_os(windows, Fun) ->
+    case os:type() of
+	{win32, _} ->
+	    Fun();
+	_ ->
+	    ok
+    end.
+	    
+    
 %% -- Misc node operation wrapper functions --
 
 start_node(Name) ->
@@ -257,20 +306,49 @@ copy_files(FromDir, ToDir) ->
 
 
 copy_dirs(FromDirRoot, ToDirRoot) ->
-    {ok, Files} = file:list_dir(FromDirRoot),
-    lists:foreach(
-      fun(FileOrDir) -> 
-	      %% Check if it's a directory or a file
-	      case filelib:is_dir(filename:join(FromDirRoot, FileOrDir)) of
-		  true ->
-		      FromDir = filename:join([FromDirRoot, FileOrDir]),
-		      ToDir   = filename:join([ToDirRoot, FileOrDir]),
-		      ok      = file:make_dir(ToDir),
-		      copy_dirs(FromDir, ToDir);
-		  false ->
-		      copy_file(FileOrDir, FromDirRoot, ToDirRoot)
-	      end
-      end, Files).
+    case file:list_dir(FromDirRoot) of
+	{ok, Files}  ->
+	    lists:foreach(
+	      fun(FileOrDir) -> 
+		      %% Check if it's a directory or a file
+		      case filelib:is_dir(filename:join(FromDirRoot, 
+							FileOrDir)) of
+			  true ->
+			      FromDir = filename:join([FromDirRoot, FileOrDir]),
+			      ToDir   = filename:join([ToDirRoot, FileOrDir]),
+			      case file:make_dir(ToDir) of
+				  ok ->
+				      copy_dirs(FromDir, ToDir);
+				  {error, Reason} ->
+				      tsp("<ERROR> Failed creating directory: "
+					  "~n   ToDir:  ~p"
+					  "~n   Reason: ~p"
+					  "~nwhen"
+					  "~n   ToDirRoot:           ~p"
+					  "~n   ToDirRoot file info: ~p", 
+					  [ToDir, 
+					   Reason, 
+					   ToDirRoot, 
+					   file:read_file_info(ToDirRoot)]),
+				      tsf({failed_copy_dir, ToDir, Reason})
+			      end;
+			  false ->
+			      copy_file(FileOrDir, FromDirRoot, ToDirRoot)
+		      end
+	      end, Files);
+	{error, Reason} ->
+	    tsp("<ERROR> Failed get directory file list: "
+		"~n   FromDirRoot: ~p"
+		"~n   Reason:      ~p"
+		"~nwhen"
+		"~n   FromDirRoot file info: ~p", 
+		[FromDirRoot, 
+		 Reason, 
+		 file:read_file_info(FromDirRoot)]),
+	    tsf({failed_list_dir, FromDirRoot, Reason})
+    end.
+	    
+		
 
 del_dirs(Dir) ->
     case file:list_dir(Dir) of
@@ -414,36 +492,64 @@ connect(ip_comm, Host, Port, Opts) ->
 	"~n   Host: ~p"
 	"~n   Port: ~p"
 	"~n   Opts: ~p", [Host, Port, Opts]),
-    case gen_tcp:connect(Host,Port, Opts) of
-	{ok, Socket} ->
-	    tsp("connect success"),
-	    {ok, Socket};
-	{error, nxdomain} ->
-	    tsp("connect error nxdomain when opts: ~p", [Opts]),
-	    connect(ip_comm, Host, Port, lists:delete(inet6, Opts));
-	{error, eafnosupport}  ->
-	    tsp("connect error eafnosupport when opts: ~p", [Opts]),
-	    connect(ip_comm, Host, Port, lists:delete(inet6, Opts));
-	{error, econnreset} ->
-	    tsp("connect error econnreset when opts: ~p", [Opts]),
-	    connect(ip_comm, Host, Port, lists:delete(inet6, Opts));
-	{error, enetunreach}  ->
-	    tsp("connect error eafnosupport when opts: ~p", [Opts]),
-	    connect(ip_comm, Host, Port, lists:delete(inet6, Opts));
-	{error, {enfile,_}} ->
-	    tsp("connect error enfile when opts: ~p", [Opts]),
-	    {error, enfile};
-	Error ->
-	    tsp("Unexpected error: "
-		"~n   Error: ~p"
-		"~nwhen"
-		"~n   Host:  ~p"
-		"~n   Port:  ~p"
-		"~n   Opts:  ~p"
-		"~n", [Error, Host, Port, Opts]),
-	    Error
-    end.
+    
+    %% We check for precence of inet6fb4. 
+    %% If found, we shall try inet6 and if that does not work
+    %% try inet (regardless of error reason)
+    case lists:delete(inet6fb4, Opts) of
+	Opts ->
+	    %% Nope, run as usual, where we use error reason 
+	    %% to detect if we are on IPv6 or not...
+	    case gen_tcp:connect(Host,Port, Opts) of
+		{ok, Socket} ->
+		    tsp("connect success"),
+		    {ok, Socket};
+		{error, nxdomain} ->
+		    tsp("connect error nxdomain when opts: ~p", [Opts]),
+		    connect(ip_comm, Host, Port, lists:delete(inet6, Opts));
+		{error, eafnosupport}  ->
+		    tsp("connect error eafnosupport when opts: ~p", [Opts]),
+		    connect(ip_comm, Host, Port, lists:delete(inet6, Opts));
+		{error, econnreset} ->
+		    tsp("connect error econnreset when opts: ~p", [Opts]),
+		    connect(ip_comm, Host, Port, lists:delete(inet6, Opts));
+		{error, enetunreach}  ->
+		    tsp("connect error eafnosupport when opts: ~p", [Opts]),
+		    connect(ip_comm, Host, Port, lists:delete(inet6, Opts));
+		{error, {enfile,_}} ->
+		    tsp("connect error enfile when opts: ~p", [Opts]),
+		    {error, enfile};
+		Error ->
+		    tsp("connect(ip_conn) -> Unexpected error: "
+			"~n   Error: ~p"
+			"~nwhen"
+			"~n   Host:  ~p"
+			"~n   Port:  ~p"
+			"~n   Opts:  ~p"
+			"~n", [Error, Host, Port, Opts]),
+		    Error
+	    end;
 
+	Opts2 ->
+	    %% Yep, so try first with inet6 and if that fails inet
+	    case gen_tcp:connect(Host, Port, [inet6|Opts2]) of
+		{ok, Socket} ->
+		    tsp("connect success"),
+		    {ok, Socket};
+		{error, Reason_inet6} ->
+		    tsp("inet6 connect failed: ~p", [Reason_inet6]),
+		    case gen_tcp:connect(Host, Port, [inet|Opts2]) of
+			{ok, Socket} ->
+			    tsp("connect success"),
+			    {ok, Socket};
+			{error, Reason_inet} ->
+			    tsp("inet connect also failed: ~p", [Reason_inet]),
+			    {error, {connect_failure, [{inet6, Reason_inet6}, 
+						       {inet,  Reason_inet}]}}
+		    end
+	    end
+    end.
+			
 
 send(ssl, Socket, Data) ->
     ssl:send(Socket, Data);
diff --git a/lib/inets/test/inets_test_lib.hrl b/lib/inets/test/inets_test_lib.hrl
index c578398c55..6a86b1b764 100644
--- a/lib/inets/test/inets_test_lib.hrl
+++ b/lib/inets/test/inets_test_lib.hrl
@@ -50,6 +50,11 @@
 
 -define(OSCMD(Cmd), inets_test_lib:oscmd(Cmd)).
 
+-define(PRINT_SYSTEM_INFO(P), inets_test_lib:print_system_info(P)).
+
+-define(RUN_ON_OS(OS, FUN),  inets_test_lib:run_on_os(OS, FUN)).
+-define(RUN_ON_WINDOWS(FUN), inets_test_lib:run_on_windows(FUN)).
+
 
 %% - Test case macros -