inets: Patch 1122

    OTP-8609  [httpc] Made cookie handling more case insensitive.

    OTP-8610  [httpc|httpd] Some netscape cookie dates are given with
              a 2-digit year (e.g. 06 = 2006).

    OTP-8624  [httpd] Added support (again) for the documented debugging
              features. See the User's Guide Configuration chapter for
              more info.

3 files changed, 17 insertions, 20 deletions

diff --git a/lib/inets/src/http_server/httpd_instance_sup.erl b/lib/inets/src/http_server/httpd_instance_sup.erl
index 0aaeb838c2..baa60d318c 100644
--- a/lib/inets/src/http_server/httpd_instance_sup.erl
+++ b/lib/inets/src/http_server/httpd_instance_sup.erl
@@ -97,14 +97,16 @@ start_link(ConfigFile, AcceptTimeout, ListenInfo, Debug) ->
 %%%=========================================================================
 %%%  Supervisor callback
 %%%=========================================================================
-init([ConfigFile, ConfigList, AcceptTimeout, _Debug, Address, Port]) -> 
+init([ConfigFile, ConfigList, AcceptTimeout, Debug, Address, Port]) -> 
+    httpd_util:enable_debug(Debug), 
     Flags = {one_for_one, 0, 1},
     Children  = [sup_spec(httpd_acceptor_sup, Address, Port), 
 		 sup_spec(httpd_misc_sup, Address, Port), 
 		 worker_spec(httpd_manager, Address, Port, 
 			     ConfigFile, ConfigList,AcceptTimeout)],
     {ok, {Flags, Children}};
-init([ConfigFile, ConfigList, AcceptTimeout, _Debug, Address, Port, ListenInfo]) -> 
+init([ConfigFile, ConfigList, AcceptTimeout, Debug, Address, Port, ListenInfo]) -> 
+    httpd_util:enable_debug(Debug), 
     Flags = {one_for_one, 0, 1},
     Children  = [sup_spec(httpd_acceptor_sup, Address, Port), 
 		 sup_spec(httpd_misc_sup, Address, Port), 
diff --git a/lib/inets/src/http_server/httpd_sup.erl b/lib/inets/src/http_server/httpd_sup.erl
index 3399f78b53..1507c6852a 100644
--- a/lib/inets/src/http_server/httpd_sup.erl
+++ b/lib/inets/src/http_server/httpd_sup.erl
@@ -185,14 +185,14 @@ httpd_child_spec(ConfigFile, AcceptTimeout, Debug) ->
 httpd_child_spec(Config, AcceptTimeout, Debug, Addr, 0) ->
 	case start_listen(Addr, 0, Config) of
 	    {Pid, {NewPort, NewConfig, ListenSocket}} ->
-		Name = {httpd_instance_sup, Addr, NewPort},
+		Name      = {httpd_instance_sup, Addr, NewPort},
 		StartFunc = {httpd_instance_sup, start_link,
 			     [NewConfig, AcceptTimeout, 
 			      {Pid, ListenSocket}, Debug]},
-		Restart = permanent, 
-		Shutdown = infinity,
-		Modules = [httpd_instance_sup],
-		Type = supervisor,
+		Restart   = permanent, 
+		Shutdown  = infinity,
+		Modules   = [httpd_instance_sup],
+		Type      = supervisor,
 		{Name, StartFunc, Restart, Shutdown, Type, Modules};
 	    {Pid, {error, Reason}}  ->
 		exit(Pid, normal),
diff --git a/lib/inets/src/http_server/httpd_util.erl b/lib/inets/src/http_server/httpd_util.erl
index b59fd861dc..cfad79638f 100644
--- a/lib/inets/src/http_server/httpd_util.erl
+++ b/lib/inets/src/http_server/httpd_util.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1997-2010. 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
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 %%
@@ -755,23 +755,18 @@ do_enable_debug([{Level,Modules}|Rest])
   when is_atom(Level) andalso is_list(Modules) ->
     case Level of
 	all_functions ->
-	    io:format("Tracing on all functions set on modules: ~p~n",
-		      [Modules]),
 	    lists:foreach(
-	      fun(X)-> 
+	      fun(X) -> 
 		      dbg:tpl(X, [{'_', [], [{return_trace}]}]) 
 	      end, Modules);
 	exported_functions -> 
-	    io:format("Tracing on exported functions set on "
-		      "modules: ~p~n",[Modules]),
 	    lists:foreach(
-	      fun(X)->
+	      fun(X) ->
 		      dbg:tp(X, [{'_', [], [{return_trace}]}]) 
 	      end, Modules);
 	disable ->
-	    io:format("Tracing disabled on modules: ~p~n", [Modules]),
 	    lists:foreach(
-	      fun(X)-> 
+	      fun(X) -> 
 		      dbg:ctp(X) 
 	      end, Modules);
 	_ ->