diff options
Diffstat (limited to 'lib/inets/src/http_server/httpd_request_handler.erl')
| -rw-r--r-- | lib/inets/src/http_server/httpd_request_handler.erl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/inets/src/http_server/httpd_request_handler.erl b/lib/inets/src/http_server/httpd_request_handler.erl index c3b47ce390..e07c7b0cd4 100644 --- a/lib/inets/src/http_server/httpd_request_handler.erl +++ b/lib/inets/src/http_server/httpd_request_handler.erl @@ -1,8 +1,14 @@ %% %% %CopyrightBegin% +<<<<<<< HEAD %% %% Copyright Ericsson AB 1997-2011. All Rights Reserved. %% +======= +%% +%% Copyright Ericsson AB 1997-2011. All Rights Reserved. +%% +>>>>>>> bmk/inets/httpd/xss_when_erl_encoded/r13/OTP-9655 %% 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 @@ -355,7 +361,7 @@ handle_http_msg({Method, Uri, Version, {RecordHeaders, Headers}, Body}, Reason = io_lib:format("Forbidden URI: ~p~n", [URI]), error_log(Reason, ModData), {stop, normal, State#state{response_sent = true}}; - {error,{bad_request, {malformed_syntax, URI}}} -> + {error, {bad_request, {malformed_syntax, URI}}} -> ?hdrd("validation failed: bad request - malformed syntax", [{uri, URI}]), httpd_response:send_status(ModData#mod{http_version = Version}, |