diff options
author | Micael Karlberg <[email protected]> | 2011-03-28 11:09:46 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-03-28 11:09:46 +0200 |
commit | 3b9072a22c8050215c3d72e46c31e73c2a95532d (patch) | |
tree | c6a6a250a9f6ec5da7aa5b3d3bee841572bfe5d2 /lib/inets/src/http_server/httpd_request_handler.erl | |
parent | 04623176f365ac58eba1df64d3054eba6c482ce4 (diff) | |
parent | cbe8b2e034a8b2cd6052df5e27f1b229ded9748e (diff) | |
download | otp-3b9072a22c8050215c3d72e46c31e73c2a95532d.tar.gz otp-3b9072a22c8050215c3d72e46c31e73c2a95532d.tar.bz2 otp-3b9072a22c8050215c3d72e46c31e73c2a95532d.zip |
Merge branch 'rj/fix-httpd-format' into bmk/inets/inet56_integration
OTP-9157
Diffstat (limited to 'lib/inets/src/http_server/httpd_request_handler.erl')
-rw-r--r-- | lib/inets/src/http_server/httpd_request_handler.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/inets/src/http_server/httpd_request_handler.erl b/lib/inets/src/http_server/httpd_request_handler.erl index a9db6e2058..c3b47ce390 100644 --- a/lib/inets/src/http_server/httpd_request_handler.erl +++ b/lib/inets/src/http_server/httpd_request_handler.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2010. All Rights Reserved. +%% Copyright Ericsson AB 1997-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 @@ -240,13 +240,13 @@ handle_info({ssl_error, _, _} = Reason, State) -> %% Timeouts handle_info(timeout, #state{mod = ModData, mfa = {_, parse, _}} = State) -> - error_log("No request received on keep-alive connection" + error_log("No request received on keep-alive connection " "before server side timeout", ModData), %% No response should be sent! {stop, normal, State#state{response_sent = true}}; handle_info(timeout, #state{mod = ModData} = State) -> httpd_response:send_status(ModData, 408, "Request timeout"), - error_log("The client did not send the whole request before the" + error_log("The client did not send the whole request before the " "server side timeout", ModData), {stop, normal, State#state{response_sent = true}}; |