diff options
| author | Micael Karlberg <[email protected]> | 2010-05-31 12:00:00 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-08-20 08:56:47 +0200 |
| commit | 6769f83da0f193052a30ff8933a014e9cf3b0cdf (patch) | |
| tree | d23e15640edcf818d388f53f179235601e407e2e /lib/inets/src/http_server/httpd_instance_sup.erl | |
| parent | 8214866f6c9e881512e22689707c19aa6816a61c (diff) | |
| download | otp-6769f83da0f193052a30ff8933a014e9cf3b0cdf.tar.gz otp-6769f83da0f193052a30ff8933a014e9cf3b0cdf.tar.bz2 otp-6769f83da0f193052a30ff8933a014e9cf3b0cdf.zip | |
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.
Diffstat (limited to 'lib/inets/src/http_server/httpd_instance_sup.erl')
| -rw-r--r-- | lib/inets/src/http_server/httpd_instance_sup.erl | 6 |
1 files changed, 4 insertions, 2 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), |