aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/http_server
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-06-05 14:06:19 +0200
committerJohn Högberg <[email protected]>2018-06-05 14:06:19 +0200
commit3836f8a1e757e6dff8316ab9938095b9611c75e6 (patch)
tree5f677921cffccfd0d5509e4c50baa50f530b5c62 /lib/inets/src/http_server
parent1002dd0444bd43353f33b03ab8fb0f19e57465dd (diff)
parent5cb944bf32b7b3f4ec5500710fe10c28a643e1fd (diff)
downloadotp-3836f8a1e757e6dff8316ab9938095b9611c75e6.tar.gz
otp-3836f8a1e757e6dff8316ab9938095b9611c75e6.tar.bz2
otp-3836f8a1e757e6dff8316ab9938095b9611c75e6.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release inets: Gracefully handle bad headers
Diffstat (limited to 'lib/inets/src/http_server')
-rw-r--r--lib/inets/src/http_server/httpd_request.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/inets/src/http_server/httpd_request.erl b/lib/inets/src/http_server/httpd_request.erl
index 007d272323..e513eb8a3a 100644
--- a/lib/inets/src/http_server/httpd_request.erl
+++ b/lib/inets/src/http_server/httpd_request.erl
@@ -259,17 +259,17 @@ parse_headers(<<?LF, Octet, Rest/binary>>, Header, Headers, Current, Max,
%% If ?CR is is missing RFC2616 section-19.3
parse_headers(<<?CR,?LF, Octet, Rest/binary>>, Header, Headers, Current, Max,
Options, Result);
-parse_headers(<<?CR,?LF, Octet, Rest/binary>>, Header, Headers, _, Max,
+parse_headers(<<?CR,?LF, Octet, Rest/binary>>, Header, Headers, Current, Max,
Options, Result) ->
case http_request:key_value(lists:reverse(Header)) of
undefined -> %% Skip headers with missing :
parse_headers(Rest, [Octet], Headers,
- 0, Max, Options, Result);
+ Current, Max, Options, Result);
NewHeader ->
case check_header(NewHeader, Options) of
ok ->
parse_headers(Rest, [Octet], [NewHeader | Headers],
- 0, Max, Options, Result);
+ Current, Max, Options, Result);
{error, Reason} ->
HttpVersion = lists:nth(3, lists:reverse(Result)),
{error, Reason, HttpVersion}