aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-02-12 10:12:02 +0100
committerIngela Anderton Andin <[email protected]>2013-02-14 10:25:30 +0100
commit79f4745f6e7254a5399c63f9947dc39c1abd21ba (patch)
treeda8119f22ce3989ce7994d29cfd48fd1b3ff47d9
parentd3e737dd9034e693203d7907797c0df8af6100e9 (diff)
downloadotp-79f4745f6e7254a5399c63f9947dc39c1abd21ba.tar.gz
otp-79f4745f6e7254a5399c63f9947dc39c1abd21ba.tar.bz2
otp-79f4745f6e7254a5399c63f9947dc39c1abd21ba.zip
inets httpd: The option modules now defaults to its documented default value.
OTP-10844
-rw-r--r--lib/inets/src/http_server/httpd_response.erl6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/inets/src/http_server/httpd_response.erl b/lib/inets/src/http_server/httpd_response.erl
index 2dedb088e4..6b6532266b 100644
--- a/lib/inets/src/http_server/httpd_response.erl
+++ b/lib/inets/src/http_server/httpd_response.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2013. 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
@@ -35,8 +35,7 @@ generate_and_send_response(#mod{init_data =
#init_data{peername = {_,"unknown"}}}) ->
ok;
generate_and_send_response(#mod{config_db = ConfigDB} = ModData) ->
- Modules = httpd_util:lookup(ConfigDB,modules,
- [mod_get, mod_head, mod_log]),
+ Modules = httpd_util:lookup(ConfigDB,modules, ?DEFAULT_MODS),
case traverse_modules(ModData, Modules) of
done ->
ok;
@@ -71,7 +70,6 @@ traverse_modules(ModData,[Module|Rest]) ->
?hdrd("traverse modules", [{callback_module, Module}]),
case (catch apply(Module, do, [ModData])) of
{'EXIT', Reason} ->
- ?hdrd("traverse modules - exit", [{reason, Reason}]),
String =
lists:flatten(
io_lib:format("traverse exit from apply: ~p:do => ~n~p",