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

4 files changed, 110 insertions, 68 deletions

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 1112208295..1cee9d17f1 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -740,6 +740,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
+    ].
 
 %%-------------------------------------------------------------------------
 
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..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,