diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-02-22 14:41:55 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-02-22 14:41:55 +0100 |
| commit | 5c7fe21f434f15a1005cb0529a64ca8461c83172 (patch) | |
| tree | 6e79aa7bbe1a72eff14e57ef260d371365de9191 /lib/inets/src/http_server/httpd_response.erl | |
| parent | 5b1d51fedf10ebc6cccaa4f43396f98c644f3ba9 (diff) | |
| parent | da3797589463002f28fc42ef27872650fe1de938 (diff) | |
| download | otp-5c7fe21f434f15a1005cb0529a64ca8461c83172.tar.gz otp-5c7fe21f434f15a1005cb0529a64ca8461c83172.tar.bz2 otp-5c7fe21f434f15a1005cb0529a64ca8461c83172.zip | |
Merge branch 'ia/inets/httpc-pipelin-vs-persisten-and-httpd-ssl-conf'
* ia/inets/httpc-pipelin-vs-persisten-and-httpd-ssl-conf:
inets httpd: Handle ipfamily option correctly when listning to port 0
inets: Improve ssl handling
inets httpd: The option modules now defaults to its documented default value.
inets httpc: Corrected separation of pipelining and persisten connections
Diffstat (limited to 'lib/inets/src/http_server/httpd_response.erl')
| -rw-r--r-- | lib/inets/src/http_server/httpd_response.erl | 6 |
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", |