Initial merge from r13 topic branch. With minimal cleanup.

Merge branch 'bmk/inets/httpd/xss_with_bad_header_date/r13/OTP-9674' into bmk/inets/httpd/xss_with_bad_header_date/r14/OTP-9674

Conflicts:
	lib/inets/doc/src/notes.xml
	lib/inets/src/http_server/mod_responsecontrol.erl
	lib/inets/src/inets_app/inets.appup.src
	lib/inets/test/httpd_1_1.erl
	lib/inets/test/httpd_SUITE.erl
	lib/inets/test/httpd_mod.erl
	lib/inets/test/httpd_test_lib.erl
	lib/inets/vsn.mk

1 files changed, 23 insertions, 2 deletions

diff --git a/lib/inets/test/httpd_test_lib.erl b/lib/inets/test/httpd_test_lib.erl
index 581461fe03..e5b0415c35 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,