Merge branch 'maint-r14'

Conflicts:
	lib/inets/doc/src/notes.xml
	lib/inets/src/http_lib/http_uri.erl
	lib/inets/src/inets_app/inets.appup.src
	lib/inets/vsn.mk

6 files changed, 300 insertions, 167 deletions

diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 6eb500ea37..d86e52f3d5 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -250,10 +250,10 @@ init_per_testcase(Case, Config) ->
     init_per_testcase(Case, 2, Config).
 
 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),
-    tsp("init_per_testcase -> stop inets"),
+    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)),
     TmpConfig   = lists:keydelete(watchdog, 1, Config),
@@ -289,12 +289,12 @@ init_per_testcase(Case, Timeout, Config) ->
 			    throw:{error, {failed_starting, App, _}} ->
 				SkipString = 
 				    "Could not start " ++ atom_to_list(App),
-				{skip, SkipString};
-			    _:X ->
+				skip(SkipString);
+			      _:X ->
 				SkipString = 
 				    lists:flatten(
 				      io_lib:format("Failed starting apps: ~p", [X])), 
-				{skip, SkipString}
+				skip(SkipString)
 			end;
 
 		    _ ->
@@ -323,14 +323,14 @@ init_per_testcase(Case, Timeout, Config) ->
 				    ],
 				case lists:member(Rest, BadCases) of
 				    true ->
-					[{skip, "TC and server not compatible"}|
+					[skip("TC and server not compatible") | 
 					 TmpConfig];
 				    false ->
 					inets:start(),
 					[{watchdog, Dog} | TmpConfig]
 				end;
 			    false ->
-				[{skip, "proxy not responding"} | TmpConfig]
+				[skip("proxy not responding") | TmpConfig]
 			end
 		end;
 
@@ -360,20 +360,19 @@ init_per_testcase(Case, Timeout, Config) ->
 			      io_lib:format("Failed starting apps: ~p", [X])), 
 			{skip, SkipString}
 		end;
+
 	    _ -> 
 		TmpConfig2 = lists:keydelete(local_server, 1, TmpConfig),
-		Server = 
-		    %% Will start inets 
-		    inets_test_lib:start_http_server(
-		      filename:join(PrivDir, IpConfFile)),
+		%% Will start inets 
+		Server = start_http_server(PrivDir, IpConfFile),
 		[{watchdog, Dog}, {local_server, Server} | TmpConfig2]
 	end,
     
     %% This will fail for the ipv6_ - cases (but that is ok)
-    httpc:set_options([{proxy, {{?PROXY, ?PROXY_PORT}, 
-     				["localhost", ?IPV6_LOCAL_HOST]}},
-		       {ipfamily, inet6fb4}]),
-
+    ProxyExceptions = ["localhost", ?IPV6_LOCAL_HOST], 
+    http:set_options([{proxy, {{?PROXY, ?PROXY_PORT}, ProxyExceptions}}]),
+    inets:enable_trace(max, io, httpc),
+    %% inets:enable_trace(max, io, all),
     %% snmp:set_trace([gen_tcp]),
     NewConfig.
 
@@ -390,7 +389,10 @@ init_per_testcase_ssl(Tag, PrivDir, SslConfFile, Config) ->
     tsp("init_per_testcase(~w) -> Server: ~p", [Tag, Server]),
     [{local_ssl_server, Server} | Config2].
 
-    
+start_http_server(ConfDir, ConfFile) ->
+    inets_test_lib:start_http_server( filename:join(ConfDir, ConfFile) ).
+
+
 %%--------------------------------------------------------------------
 %% Function: end_per_testcase(Case, Config) -> _
 %% Case - atom()
@@ -726,7 +728,7 @@ test_pipeline(URL) ->
 		    p("test_pipeline -> received reply for (async) request 2"),
 		    ok;
 		{http, Msg1} ->
-		    test_server:fail(Msg1)
+		    tsf(Msg1)
 	    end;
 	{http, {RequestId2, {{_, 200, _}, _, _}}} ->
 	    io:format("test_pipeline -> received reply for (async) request 2 - now wait for 1"),
@@ -735,14 +737,14 @@ test_pipeline(URL) ->
 		    io:format("test_pipeline -> received reply for (async) request 1"),
 		    ok;
 		{http, Msg2} ->
-		    test_server:fail(Msg2)
+		    tsf(Msg2)
 	    end;
 	{http, Msg3} ->
-	    test_server:fail(Msg3)
+	    tsf(Msg3)
     after 60000 ->
 	    receive Any1 ->
 		    tsp("received crap after timeout: ~n   ~p", [Any1]),
-		    test_server:fail({error, {timeout, Any1}})
+		    tsf({error, {timeout, Any1}})
 	    end
     end,
 
@@ -767,7 +769,7 @@ test_pipeline(URL) ->
      p("test_pipeline -> expect *no* reply for cancelled (async) request 4 (for 3 secs)"),
      receive
 	 {http, {RequestId3, _}} ->
-	     test_server:fail(http_cancel_request_failed)
+	     tsf(http_cancel_request_failed)
      after 3000 ->
 	     ok
      end,
@@ -780,11 +782,11 @@ test_pipeline(URL) ->
 		tsp("Receive : ~p", [Res]),
 		BinBody4;
 	    {http, Msg4} ->
-		test_server:fail(Msg4)
+		tsf(Msg4)
 	after 60000 ->
 		receive Any2 ->
 			tsp("received crap after timeout: ~n   ~p", [Any2]),
-			test_server:fail({error, {timeout, Any2}})
+			tsf({error, {timeout, Any2}})
 		end
 	end,
 
@@ -794,7 +796,7 @@ test_pipeline(URL) ->
     p("test_pipeline -> ensure no unexpected incomming"),
     receive
 	{http, Any} ->
-	    test_server:fail({unexpected_message, Any})
+	    tsf({unexpected_message, Any})
     after 500 ->
 	    ok
     end,
@@ -816,11 +818,11 @@ http_trace(Config) when is_list(Config) ->
 		{ok, {{_,200,_}, [_ | _], "TRACE /dummy.html" ++ _}} ->
 		    ok;
 		{ok, {{_,200,_}, [_ | _], WrongBody}} ->
-		    test_server:fail({wrong_body, WrongBody});
+		    tsf({wrong_body, WrongBody});
 		{ok, WrongReply} ->
-		    test_server:fail({wrong_reply, WrongReply});
+		    tsf({wrong_reply, WrongReply});
 		Error ->
-		    test_server:fail({failed, Error})
+		    tsf({failed, Error})
 	    end;
 	_ ->
 	    {skip, "Failed to start local http-server"}
@@ -843,7 +845,7 @@ http_async(Config) when is_list(Config) ->
 		    {http, {RequestId, {{_, 200, _}, _, BinBody}}} ->
 			BinBody;
 		    {http, Msg} ->
-			test_server:fail(Msg)
+			tsf(Msg)
 		end,
 	    
 	    inets_test_lib:check_body(binary_to_list(Body)),
@@ -853,7 +855,7 @@ http_async(Config) when is_list(Config) ->
 	    ok = httpc:cancel_request(NewRequestId),
 	    receive 
 		{http, {NewRequestId, _NewResult}} ->
-		    test_server:fail(http_cancel_request_failed)
+		    tsf(http_cancel_request_failed)
 	    after 3000 ->
 		    ok
 	    end;
@@ -902,7 +904,7 @@ http_save_to_file_async(Config) when is_list(Config) ->
 		{http, {RequestId, saved_to_file}} ->
 		    ok;
 		{http, Msg} ->
-		    test_server:fail(Msg)
+		    tsf(Msg)
 	    end,
 
 	    {ok, Bin} = file:read_file(FilePath), 
@@ -1448,10 +1450,10 @@ proxy_options(Config) when is_list(Config) ->
 			{value, {"allow", _}} ->
 			    ok;
 			_ ->
-			    test_server:fail(http_options_request_failed)
+			    tsf(http_options_request_failed)
 		    end;
 		Unexpected ->
-		    test_server:fail({unexpected_result, Unexpected})
+		    tsf({unexpected_result, Unexpected})
 	    end;
 	Reason ->
 	    {skip, Reason}
@@ -1472,7 +1474,7 @@ proxy_head(Config) when is_list(Config) ->
 		{ok, {{_,200, _}, [_ | _], []}} ->
 		    ok;
 		Unexpected ->
-		    test_server:fail({unexpected_result, Unexpected})
+		    tsf({unexpected_result, Unexpected})
 	    end;
 	Reason ->
 	    {skip, Reason}
@@ -1491,7 +1493,7 @@ proxy_get(Config) when is_list(Config) ->
 		{ok, {{_,200,_}, [_ | _], Body = [_ | _]}} ->
 		    inets_test_lib:check_body(Body);
 		Unexpected ->
-		    test_server:fail({unexpected_result, Unexpected})
+		    tsf({unexpected_result, Unexpected})
 	    end;
 	Reason ->
 	    {skip, Reason}
@@ -1570,7 +1572,7 @@ proxy_post(Config) when is_list(Config) ->
 		{ok, {{_,405,_}, [_ | _], [_ | _]}} ->
 		    ok;
 		Unexpected ->
-		    test_server:fail({unexpected_result, Unexpected})
+		    tsf({unexpected_result, Unexpected})
 	    end;
 	Reason ->
 	    {skip, Reason}
@@ -1595,7 +1597,7 @@ proxy_put(Config) when is_list(Config) ->
 		{ok, {{_,405,_}, [_ | _], [_ | _]}} ->
 		    ok;
 		Unexpected ->
-		    test_server:fail({unexpected_result, Unexpected})
+		    tsf({unexpected_result, Unexpected})
 	    end;
 	Reason ->
 	    {skip, Reason}
@@ -1620,7 +1622,7 @@ proxy_delete(Config) when is_list(Config) ->
 		{ok, {{_,404,_}, [_ | _], [_ | _]}} ->
 		    ok;
 		Unexpected ->
-		    test_server:fail({unexpected_result, Unexpected})
+		    tsf({unexpected_result, Unexpected})
 	    end;
 	Reason ->
 	    {skip, Reason}
@@ -1676,7 +1678,7 @@ proxy_auth(Config) when is_list(Config) ->
 		{ok, {{_,200, _}, [_ | _], [_|_]}} ->
 		    ok;
 		Unexpected ->
-		    test_server:fail({unexpected_result, Unexpected})
+		    tsf({unexpected_result, Unexpected})
 	    end;
 	Reason ->
 	    {skip, Reason}
@@ -1762,7 +1764,7 @@ http_stream(Config) when is_list(Config) ->
 	{http, {RequestId, stream_start, _Headers}} ->
 	    ok;
 	{http, Msg} ->
-	    test_server:fail(Msg)
+	    tsf(Msg)
     end,
 
     StreamedBody = receive_streamed_body(RequestId, <<>>),
@@ -1817,7 +1819,7 @@ once(URL) ->
 		  [RequestId, Pid]),
 		Pid;
 	    {http, Msg} ->
-		test_server:fail(Msg)
+		tsf(Msg)
 	end,
 
     tsp("once -> request handler: ~p", [NewPid]),
@@ -1860,7 +1862,7 @@ proxy_stream(Config) when is_list(Config) ->
 		{http, {RequestId, stream_start, _Headers}} ->
 		    ok;
 		{http, Msg} ->
-		    test_server:fail(Msg)
+		    tsf(Msg)
 	    end,
 	    
 	    StreamedBody = receive_streamed_body(RequestId, <<>>),
@@ -2979,7 +2981,7 @@ receive_streamed_body(RequestId, Body) ->
 	{http, {RequestId, stream_end, _Headers}} ->
 	    Body;
 	{http, Msg} ->	    
-	    test_server:fail(Msg)
+	    tsf(Msg)
     end.
 
 receive_streamed_body(RequestId, Body, Pid) ->
@@ -2993,7 +2995,7 @@ receive_streamed_body(RequestId, Body, Pid) ->
 	{http, {RequestId, stream_end, _Headers}} ->
 	    Body;
 	{http, Msg} ->	    
-	    test_server:fail(Msg)
+	    tsf(Msg)
     end.
 
 %% Perform a synchronous stop
@@ -3451,7 +3453,7 @@ handle_auth("Basic " ++ UserInfo, Challange, DefaultResponse) ->
     end.
 
 check_cookie([]) ->
-    test_server:fail(no_cookie_header);
+    tsf(no_cookie_header);
 check_cookie(["cookie:" ++ _Value | _]) ->
     ok;
 check_cookie([_Head | Tail]) ->
@@ -3509,9 +3511,9 @@ p(F, A) ->
     io:format("~p ~w:" ++ F ++ "~n", [self(), ?MODULE | A]).
 
 tsp(F) ->
-    tsp(F, []).
+    inets_test_lib:tsp(F).
 tsp(F, A) ->
-    test_server:format("~p ~p:" ++ F ++ "~n", [self(), ?MODULE | A]).
+    inets_test_lib:tsp(F, A).
 
 tsf(Reason) ->
     test_server:fail(Reason).
@@ -3566,3 +3568,6 @@ ensure_started(App) when is_atom(App) ->
 	    throw({error, {failed_starting, App, Error}})
     end.
 
+
+skip(Reason) ->
+    {skip, Reason}.
diff --git a/lib/inets/test/httpd_1_1.erl b/lib/inets/test/httpd_1_1.erl
index 2a6110e3ea..07d94ea97a 100644
--- a/lib/inets/test/httpd_1_1.erl
+++ b/lib/inets/test/httpd_1_1.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2011. 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
@@ -19,7 +19,6 @@
 %%
 
 -module(httpd_1_1).
--author('[email protected]').
 
 -include("test_server.hrl").
 -include("test_server_line.hrl").
@@ -159,70 +158,79 @@ if_test(Type, Port, Host, Node, DocRoot)->
 	calendar:datetime_to_gregorian_seconds(FileInfo#file_info.mtime),
     
     Mod = httpd_util:rfc1123_date(calendar:gregorian_seconds_to_datetime(
-				      CreatedSec-1)),
-
+    				      CreatedSec-1)),
+    
     %% Test that we get the data when the file is modified
     ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
-					  "GET / HTTP/1.1\r\nHost:" ++ Host ++
-					  "\r\nIf-Modified-Since:" ++
-					  Mod ++ "\r\n\r\n",
-					  [{statuscode, 200}]),
-     Mod1 = httpd_util:rfc1123_date(calendar:gregorian_seconds_to_datetime(
- 				     CreatedSec+100)),
-     ok = httpd_test_lib:verify_request(Type,Host,Port,Node, 
- 				       "GET / HTTP/1.1\r\nHost:"
- 				       ++ Host ++"\r\nIf-Modified-Since:"
- 				       ++ Mod1 ++"\r\n\r\n",
- 				       [{statuscode, 304}]),
+    				       "GET / HTTP/1.1\r\nHost:" ++ Host ++
+    				       "\r\nIf-Modified-Since:" ++
+    				       Mod ++ "\r\n\r\n",
+    				       [{statuscode, 200}]),
+    Mod1 = httpd_util:rfc1123_date(calendar:gregorian_seconds_to_datetime(
+    				     CreatedSec+100)),
+    ok = httpd_test_lib:verify_request(Type,Host,Port,Node, 
+    				       "GET / HTTP/1.1\r\nHost:"
+    				       ++ Host ++"\r\nIf-Modified-Since:"
+    				       ++ Mod1 ++"\r\n\r\n",
+    				       [{statuscode, 304}]),
     
+
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
+				       "GET / HTTP/1.1\r\nHost:" ++ Host ++
+				       "\r\nIf-Modified-Since:" ++
+				       "AAA[...]AAAA" ++ "\r\n\r\n",
+				       [{statuscode, 400}]),
+
+
      Mod2 =  httpd_util:rfc1123_date(calendar:gregorian_seconds_to_datetime(
- 				      CreatedSec+1)),
+    				      CreatedSec+1)),
      %% Control that the If-Unmodified-Header lmits the response
      ok = httpd_test_lib:verify_request(Type,Host,Port,Node, 
- 					  "GET / HTTP/1.1\r\nHost:"
- 					  ++ Host ++ 
- 					  "\r\nIf-Unmodified-Since:" ++ Mod2 
- 					  ++ "\r\n\r\n",
- 					  [{statuscode, 200}]),
+    					  "GET / HTTP/1.1\r\nHost:"
+    					  ++ Host ++ 
+    					  "\r\nIf-Unmodified-Since:" ++ Mod2 
+    					  ++ "\r\n\r\n",
+    					  [{statuscode, 200}]),
      Mod3 = httpd_util:rfc1123_date(calendar:gregorian_seconds_to_datetime(
- 				     CreatedSec-1)),
+    				     CreatedSec-1)),
     
      ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
- 					  "GET / HTTP/1.1\r\nHost:"
- 					  ++ Host ++ 
- 					  "\r\nIf-Unmodified-Since:"++ Mod3 
- 					  ++"\r\n\r\n",
- 					  [{statuscode, 412}]),
-
+    					  "GET / HTTP/1.1\r\nHost:"
+    					  ++ Host ++ 
+    					  "\r\nIf-Unmodified-Since:"++ Mod3 
+    					  ++"\r\n\r\n",
+    					  [{statuscode, 412}]),
+    
      %% Control that we get the body when the etag match
      ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
- 					  "GET / HTTP/1.1\r\nHost:" ++ Host 
- 					  ++"\r\n"++
- 					  "If-Match:"++ 
- 					  httpd_util:create_etag(FileInfo)++
- 					  "\r\n\r\n",
- 					  [{statuscode, 200}]),
+    					  "GET / HTTP/1.1\r\nHost:" ++ Host 
+    					  ++"\r\n"++
+    					  "If-Match:"++ 
+    					  httpd_util:create_etag(FileInfo)++
+    					  "\r\n\r\n",
+    					  [{statuscode, 200}]),
      ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
- 					  "GET / HTTP/1.1\r\nHost:" ++ 
- 					  Host ++ "\r\n"++
- 					  "If-Match:NotEtag\r\n\r\n",
- 					  [{statuscode, 412}]),
+    					  "GET / HTTP/1.1\r\nHost:" ++ 
+    					  Host ++ "\r\n"++
+    					  "If-Match:NotEtag\r\n\r\n",
+    					  [{statuscode, 412}]),
     
      %% Control the response when the if-none-match header is there
      ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
- 					  "GET / HTTP/1.1\r\nHost:"
- 					  ++ Host ++"\r\n"++
- 					  "If-None-Match:NoTaag," ++ 
- 					  httpd_util:create_etag(FileInfo) ++
- 					  "\r\n\r\n",
- 					  [{statuscode, 304}]),
-  
+    					  "GET / HTTP/1.1\r\nHost:"
+    					  ++ Host ++"\r\n"++
+    					  "If-None-Match:NoTaag," ++ 
+    					  httpd_util:create_etag(FileInfo) ++
+    					  "\r\n\r\n",
+    					  [{statuscode, 304}]),
+    
     ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
-					  "GET / HTTP/1.1\r\nHost:"
-					  ++ Host ++ "\r\n"++
-					  "If-None-Match:NotEtag,"
-					  "NeihterEtag\r\n\r\n",
-					  [{statuscode,200}]).
+    					  "GET / HTTP/1.1\r\nHost:"
+    					  ++ Host ++ "\r\n"++
+    					  "If-None-Match:NotEtag,"
+    					  "NeihterEtag\r\n\r\n",
+    					  [{statuscode,200}]),
+    ok.
     
 http_trace(Type, Port, Host, Node)->
     ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index faeed3b5f9..ba31788ccc 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -686,6 +686,19 @@ end_per_testcase2(Case, Config) ->
 
 
 %%-------------------------------------------------------------------------
+http_1_1_ip(doc) ->
+    ["HTTP/1.1"];
+http_1_1_ip(suite) ->
+    [
+     ip_host, 
+     ip_chunked, 
+     ip_expect, 
+     ip_range, 
+     ip_if_test, 
+     ip_http_trace,
+     ip_http1_1_head, 
+     ip_mod_cgi_chunked_encoding_test
+    ].
 
 %%-------------------------------------------------------------------------
 
@@ -2276,24 +2289,24 @@ ticket_5913(doc) ->
     ["Tests that a header without last-modified is handled"];
 ticket_5913(suite) -> [];
 ticket_5913(Config) ->
-    ok=httpd_test_lib:verify_request(ip_comm, ?config(host, Config),
-				     ?IP_PORT, ?config(node, Config),
+    ok = httpd_test_lib:verify_request(ip_comm, ?config(host, Config),
+				       ?IP_PORT, ?config(node, Config),
 				       "GET /cgi-bin/erl/httpd_example:get_bin "
 				       "HTTP/1.0\r\n\r\n", 
 				       [{statuscode, 200},
-				       {version, "HTTP/1.0"}]),
+					{version, "HTTP/1.0"}]),
     ok.
 
 ticket_6003(doc) ->
     ["Tests that a URI with a bad hexadecimal code is handled"];
 ticket_6003(suite) -> [];
 ticket_6003(Config) ->
-    ok=httpd_test_lib:verify_request(ip_comm, ?config(host, Config),
-				     ?IP_PORT, ?config(node, Config),
-				     "GET http://www.erlang.org/%skalle "
-				     "HTTP/1.0\r\n\r\n",
-				     [{statuscode, 400},
-				      {version, "HTTP/1.0"}]),
+    ok = httpd_test_lib:verify_request(ip_comm, ?config(host, Config),
+				       ?IP_PORT, ?config(node, Config),
+				       "GET http://www.erlang.org/%skalle "
+				       "HTTP/1.0\r\n\r\n",
+				       [{statuscode, 400},
+					{version, "HTTP/1.0"}]),
     ok.
 
 ticket_7304(doc) ->
diff --git a/lib/inets/test/httpd_basic_SUITE.erl b/lib/inets/test/httpd_basic_SUITE.erl
index f23d0b4765..4cd38f2ec4 100644
--- a/lib/inets/test/httpd_basic_SUITE.erl
+++ b/lib/inets/test/httpd_basic_SUITE.erl
@@ -59,9 +59,28 @@ init_per_suite(Config) ->
 	"~n   Config: ~p", [Config]),
     ok = inets:start(),
     PrivDir = ?config(priv_dir, Config),
-    HttpdConf = [{port, 0}, {ipfamily, inet}, 
-		 {server_name, "httpd_test"}, {server_root, PrivDir},
-		 {document_root, PrivDir}, {bind_address, "localhost"}],
+
+    Dummy = 
+"<HTML>
+<HEAD>
+<TITLE>/index.html</TITLE>
+</HEAD>
+<BODY>
+DUMMY
+</BODY>
+</HTML>",
+
+    DummyFile = filename:join([PrivDir,"dummy.html"]),
+    {ok, Fd}  = file:open(DummyFile, [write]),
+    ok        = file:write(Fd, Dummy),
+    ok        = file:close(Fd), 
+    HttpdConf = [{port,          0}, 
+		 {ipfamily,      inet}, 
+		 {server_name,   "httpd_test"}, 
+		 {server_root,   PrivDir},
+		 {document_root, PrivDir}, 
+		 {bind_address,  "localhost"}],
+
     [{httpd_conf, HttpdConf} |  Config].
 
 %%--------------------------------------------------------------------
@@ -133,6 +152,10 @@ uri_too_long_414(Config) when is_list(Config) ->
  				        {version, "HTTP/0.9"}]),    
     inets:stop(httpd, Pid).
     
+
+%%-------------------------------------------------------------------------
+%%-------------------------------------------------------------------------
+
 header_too_long_413(doc) ->
     ["Test that too long headers's get 413 HTTP code"];
 header_too_long_413(suite) ->
@@ -152,34 +175,92 @@ header_too_long_413(Config) when is_list(Config) ->
  				        {version, "HTTP/1.1"}]),
     inets:stop(httpd, Pid).
    
+
+%%-------------------------------------------------------------------------
+%%-------------------------------------------------------------------------
+
 escaped_url_in_error_body(doc) ->
     ["Test Url-encoding see OTP-8940"];
 escaped_url_in_error_body(suite) ->
     [];
 escaped_url_in_error_body(Config) when is_list(Config) ->
-    tsp("escaped_url_in_error_body -> entry with"
-	"~n   Config: ~p", [Config]),
-    HttpdConf = ?config(httpd_conf, Config),
-    {ok, Pid} = inets:start(httpd, [{port, 0} | HttpdConf]),
-    Info = httpd:info(Pid),
-    Port = proplists:get_value(port, Info),
-    _Address = proplists:get_value(bind_address, Info),
-    Path = "/<b>this_is_bold</b>",
-    URL = ?URL_START ++ integer_to_list(Port) ++ Path,
-    EscapedPath = http_uri:encode(Path),
-    {ok, {404, Body1}} = httpc:request(get, {URL, []},
-				       [{url_encode, true}, 
-					{version,    "HTTP/1.0"}],
-				      [{full_result, false}]),
-    EscapedPath = find_URL_path(string:tokens(Body1, " ")),
-    {ok, {404, Body2}} = httpc:request(get, {URL, []},
-				       [{url_encode,  false}, 
-					{version,     "HTTP/1.0"}], 
-				       [{full_result, false}]),
+    tsp("escaped_url_in_error_body -> entry"),
+    HttpdConf   = ?config(httpd_conf, Config),
+    {ok, Pid}   = inets:start(httpd, [{port, 0} | HttpdConf]),
+    Info        = httpd:info(Pid),
+    Port        = proplists:get_value(port,         Info),
+    _Address    = proplists:get_value(bind_address, Info),
+
+    %% Request 1
+    tsp("escaped_url_in_error_body -> request 1"),
+    URL1        = ?URL_START ++ integer_to_list(Port),
+    %% Make sure the server is ok, by making a request for a valid page
+    case httpc:request(get, {URL1 ++ "/dummy.html", []},
+		       [{url_encode,  false}, 
+			{version,     "HTTP/1.0"}],
+		       [{full_result, false}]) of
+	{ok, {200, _}} ->
+	    %% Don't care about the the body, just that we get a ok response
+	    ok;
+	{ok, UnexpectedOK1} ->
+	    tsf({unexpected_ok_1, UnexpectedOK1})
+    end,
+
+    %% Request 2
+    tsp("escaped_url_in_error_body -> request 2"),
+    %% Make sure the server is ok, by making a request for a valid page
+    case httpc:request(get, {URL1 ++ "/dummy.html", []},
+		       [{url_encode,  true}, 
+			{version,     "HTTP/1.0"}],
+		       [{full_result, false}]) of
+	{ok, {200, _}} ->
+	    %% Don't care about the the body, just that we get a ok response
+	    ok;
+	{ok, UnexpectedOK2} ->
+	    tsf({unexpected_ok_2, UnexpectedOK2})
+    end,
+
+    %% Request 3
+    tsp("escaped_url_in_error_body -> request 3"),
+    %% Ask for a non-existing page(1)
+    Path            = "/<b>this_is_bold<b>",
     HTMLEncodedPath = http_util:html_encode(Path),
-    HTMLEncodedPath = find_URL_path(string:tokens(Body2, " ")),
+    URL2            = URL1 ++ Path,
+    case httpc:request(get, {URL2, []},
+		       [{url_encode,  true}, 
+			{version,     "HTTP/1.0"}],
+		       [{full_result, false}]) of
+	{ok, {404, Body3}} ->
+	    case find_URL_path(string:tokens(Body3, " ")) of
+		HTMLEncodedPath ->
+		    ok;
+		BadPath3 ->
+		    tsf({unexpected_path_3, HTMLEncodedPath, BadPath3})
+	    end;
+	{ok, UnexpectedOK3} ->
+	    tsf({unexpected_ok_1, UnexpectedOK3})
+    end,
+
+    %% Request 4
+    tsp("escaped_url_in_error_body -> request 4"),
+    %% Ask for a non-existing page(2)
+    case httpc:request(get, {URL2, []}, 
+		       [{url_encode,  false}, 
+			{version,     "HTTP/1.0"}],
+		       [{full_result, false}]) of
+	{ok, {404, Body4}} ->
+	    case find_URL_path(string:tokens(Body4, " ")) of
+		HTMLEncodedPath ->
+		    ok;
+		BadPath4 ->
+		    tsf({unexpected_path_2, HTMLEncodedPath, BadPath4})
+	    end;
+	{ok, UnexpectedOK4} ->
+	    tsf({unexpected_ok_4, UnexpectedOK4})
+    end, 
+    tsp("escaped_url_in_error_body -> stop inets"),
     inets:stop(httpd, Pid),
-    tsp("escaped_url_in_error_body -> done"),
+    tsp("escaped_url_in_error_body -> done"),    
     ok.
 
 find_URL_path([]) ->
@@ -191,7 +272,14 @@ find_URL_path([_ | Rest]) ->
 
 
 tsp(F) ->
-    tsp(F, []).
+    inets_test_lib:tsp(F).
 tsp(F, A) ->
-    test_server:format("~p ~p:" ++ F ++ "~n", [self(), ?MODULE | A]).
+    inets_test_lib:tsp(F, A).
+
+tsf(Reason) ->
+    test_server:fail(Reason).
+
+
+skip(Reason) ->
+    {skip, Reason}.
 
diff --git a/lib/inets/test/httpd_mod.erl b/lib/inets/test/httpd_mod.erl
index 1754cec7bc..5016cdb9e6 100644
--- a/lib/inets/test/httpd_mod.erl
+++ b/lib/inets/test/httpd_mod.erl
@@ -1,8 +1,8 @@
 %%
 %% %CopyrightBegin%
-%%
+%% 
 %% Copyright Ericsson AB 2005-2011. 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
 %% compliance with the License. You should have received a copy of the
@@ -88,13 +88,13 @@ actions(Type, Port, Host, Node) ->
 
 %%-------------------------------------------------------------------------
 security(ServerRoot, Type, Port, Host, Node) ->
-%%     io:format(user, "~w:security -> entry with"
-%% 	      "~n   ServerRoot: ~p"
-%% 	      "~n   Type:       ~p"
-%% 	      "~n   Port:       ~p"
-%% 	      "~n   Host:       ~p"
-%% 	      "~n   Node:       ~p"
-%% 	      "~n", [?MODULE, ServerRoot, Type, Port, Host, Node]),
+    %% io:format(user, "~w:security -> entry with"
+    %% 	      "~n   ServerRoot: ~p"
+    %% 	      "~n   Type:       ~p"
+    %% 	      "~n   Port:       ~p"
+    %% 	      "~n   Host:       ~p"
+    %% 	      "~n   Node:       ~p"
+    %% 	      "~n", [?MODULE, ServerRoot, Type, Port, Host, Node]),
     
 %%     io:format(user, "~w:security -> register~n", [?MODULE]), 
     global:register_name(mod_security_test, self()),   % Receive events
@@ -175,8 +175,8 @@ security(ServerRoot, Type, Port, Host, Node) ->
 	[{"one",_, Port, OpenDir,_}] ->
 	    ok;
 	Blocked ->
-	    io:format(user, "~w:security -> Blocked: ~p"
-		      "~n", [?MODULE, Blocked]),
+	    %% io:format(user, "~w:security -> Blocked: ~p"
+	    %% 	      "~n", [?MODULE, Blocked]),
 	    exit({unexpected_blocked, Blocked})
     end,
 	    
@@ -917,11 +917,11 @@ list_users(Node, Root, _Host, Port, Dir) ->
 
 
 receive_security_event(Event, Node, Port) ->
-%%     io:format(user, "~w:receive_security_event -> entry with"
-%% 	      "~n   Event: ~p"
-%% 	      "~n   Node:  ~p"
-%% 	      "~n   Port:  ~p"
-%% 	      "~n", [?MODULE, Event, Node, Port]),
+    %% io:format(user, "~w:receive_security_event -> entry with"
+    %% 	      "~n   Event: ~p"
+    %% 	      "~n   Node:  ~p"
+    %% 	      "~n   Port:  ~p"
+    %% 	      "~n", [?MODULE, Event, Node, Port]),
     receive 
 	Event ->
 	    ok;
diff --git a/lib/inets/test/httpd_test_lib.erl b/lib/inets/test/httpd_test_lib.erl
index 581461fe03..1c7bb512cc 100644
--- a/lib/inets/test/httpd_test_lib.erl
+++ b/lib/inets/test/httpd_test_lib.erl
@@ -1,8 +1,8 @@
 %%
 %% %CopyrightBegin%
-%%
+%% 
 %% Copyright Ericsson AB 2001-2011. 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
 %% compliance with the License. You should have received a copy of the
@@ -140,6 +140,9 @@ request(#state{mfa = {Module, Function, Args},
     HeadRequest = lists:sublist(RequestStr, 1, 4),
     receive 
 	{tcp, Socket, Data} ->
+	    io:format("~p ~w[~w]request -> received (tcp) data"
+		      "~n   Data: ~p"
+		      "~n", [self(), ?MODULE, ?LINE, Data]),
 	    print(tcp, Data, State),
 	    case Module:Function([Data | Args]) of
 		{ok, Parsed} ->
@@ -150,11 +153,19 @@ request(#state{mfa = {Module, Function, Args},
 		    request(State#state{mfa = NewMFA}, TimeOut)
 	    end;
 	{tcp_closed, Socket} when Function =:= whole_body ->
+	    io:format("~p ~w[~w]request -> "
+		      "received (tcp) closed when whole_body"
+		      "~n", [self(), ?MODULE, ?LINE]),
 	    print(tcp, "closed", State),
 	    State#state{body = hd(Args)}; 
 	{tcp_closed, Socket} ->
+	    io:format("~p ~w[~w]request -> received (tcp) closed"
+		      "~n", [self(), ?MODULE, ?LINE]),
 	    test_server:fail(connection_closed);
 	{tcp_error, Socket, Reason} ->
+	    io:format("~p ~w[~w]request -> received (tcp) error"
+		      "~n   Reason: ~p"
+		      "~n", [self(), ?MODULE, ?LINE, Reason]),
 	    test_server:fail({tcp_error, Reason});    
 	{ssl, Socket, Data} ->
 	    print(ssl, Data, State),
@@ -174,11 +185,21 @@ request(#state{mfa = {Module, Function, Args},
 	{ssl_error, Socket, Reason} ->
 	    test_server:fail({ssl_error, Reason})
     after TimeOut ->
+	    io:format("~p ~w[~w]request -> timeout"
+		      "~n", [self(), ?MODULE, ?LINE]),
 	    test_server:fail(connection_timed_out)    
     end.
 
 handle_http_msg({Version, StatusCode, ReasonPharse, Headers, Body}, 
 		State = #state{request = RequestStr}) ->
+    io:format("~p ~w[~w]handle_http_msg -> entry with"
+	      "~n   Version:      ~p"
+	      "~n   StatusCode:   ~p"
+	      "~n   ReasonPharse: ~p"
+	      "~n   Headers:      ~p"
+	      "~n   Body:         ~p"
+	      "~n", [self(), ?MODULE, ?LINE, 
+		     Version, StatusCode, ReasonPharse, Headers, Body]),
     case is_expect(RequestStr) of
 	true ->
 	    State#state{status_line = {Version, 
@@ -235,13 +256,14 @@ handle_http_body(Body, State = #state{headers = Headers,
      end.
 
 validate(RequestStr, #state{status_line = {Version, StatusCode, _},
-		headers = Headers, 
-		body = Body}, Options, N, P) ->
+			    headers     = Headers, 
+			    body        = Body}, Options, N, P) ->
     
     %% tsp("validate -> entry with"
     %% 	"~n   StatusCode: ~p"
     %% 	"~n   Headers:    ~p"
     %% 	"~n   Body:       ~p", [StatusCode, Headers, Body]),
+
     check_version(Version, Options),
     case lists:keysearch(statuscode, 1, Options) of
 	{value, _} ->
@@ -255,6 +277,7 @@ validate(RequestStr, #state{status_line = {Version, StatusCode, _},
 	       list_to_integer(Headers#http_response_h.'content-length'),
 	       Body).
 
+
 %%--------------------------------------------------------------------
 %% Internal functions
 %%------------------------------------------------------------------
@@ -263,21 +286,20 @@ check_version(Version, Options) ->
 	{value, {version, Version}} ->
 	    	   ok;
 	{value, {version, Ver}} ->
-	    test_server:fail({wrong_version, [{got, Version},
-						     {expected, Ver}]});
+	    tsf({wrong_version, [{got, Version},
+					      {expected, Ver}]});
 	_ ->
 	   case Version of
 	       "HTTP/1.1" ->
 		   ok;
 	       _ ->
-		   test_server:fail({wrong_version, [{got, Version},
-						     {expected, "HTTP/1.1"}]})
+		   tsf({wrong_version, [{got,      Version}, 
+					{expected, "HTTP/1.1"}]})
 	   end
     end.
 
 check_status_code(StatusCode, [], Options) ->
-    test_server:fail({wrong_status_code, [{got, StatusCode}, 
-					  {expected, Options}]});
+    tsf({wrong_status_code, [{got, StatusCode}, {expected, Options}]});
 check_status_code(StatusCode, Current = [_ | Rest], Options) ->
     case lists:keysearch(statuscode, 1, Current) of
 	{value, {statuscode, StatusCode}} ->
@@ -285,8 +307,7 @@ check_status_code(StatusCode, Current = [_ | Rest], Options) ->
 	{value, {statuscode, _OtherStatus}} ->
 	    check_status_code(StatusCode, Rest, Options);
 	false ->
-	    test_server:fail({wrong_status_code, [{got, StatusCode}, 
-				       {expected, Options}]})
+	    tsf({wrong_status_code, [{got, StatusCode}, {expected, Options}]})
     end.
 
 do_validate(_, [], _, _) ->
@@ -317,8 +338,7 @@ do_validate(Header, [{header, HeaderField, Value}|Rest],N,P) ->
 			      Header})
     end,
     do_validate(Header, Rest, N, P);
-do_validate(Header,[{no_last_modified,HeaderField}|Rest],N,P) ->
-%    io:format("Header: ~p~nHeaderField: ~p~n",[Header,HeaderField]),
+do_validate(Header,[{no_last_modified, HeaderField}|Rest],N,P) ->
     case lists:keysearch(HeaderField,1,Header) of
 	{value,_} ->
 	    test_server:fail({wrong_header_field_value, HeaderField, 
@@ -331,7 +351,6 @@ do_validate(Header, [_Unknown | Rest], N, P) ->
     do_validate(Header, Rest, N, P).
 
 is_expect(RequestStr) ->
-   
     case inets_regexp:match(RequestStr, "xpect:100-continue") of
 	{match, _, _}->
 	    true;
@@ -340,15 +359,15 @@ is_expect(RequestStr) ->
     end.
 
 %% OTP-5775, content-length
-check_body("GET /cgi-bin/erl/httpd_example:get_bin HTTP/1.0\r\n\r\n", 200, "text/html", Length, _Body) when Length /= 274->
-    test_server:fail(content_length_error);
+check_body("GET /cgi-bin/erl/httpd_example:get_bin HTTP/1.0\r\n\r\n", 200, "text/html", Length, _Body) when (Length =/= 274) ->
+    tsf(content_length_error);
 check_body("GET /cgi-bin/cgi_echo HTTP/1.0\r\n\r\n", 200, "text/plain", 
 	   _, Body) ->
     case size(Body) of
 	100 ->
 	    ok;
 	_ ->
-	    test_server:fail(content_length_error)
+	    tsf(content_length_error)
     end;
 
 check_body(RequestStr, 200, "text/html", _, Body) ->