diff options
| author | John Högberg <[email protected]> | 2018-06-05 14:05:38 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-06-05 14:05:38 +0200 |
| commit | 5cb944bf32b7b3f4ec5500710fe10c28a643e1fd (patch) | |
| tree | 817ed501c02aeda7cdc03725a6d4325a7f5741b0 /lib/inets/src/http_server/httpd_request.erl | |
| parent | bbb3d151e6329d58b34e526fefb6964677d93104 (diff) | |
| parent | cfaede58328ace4bb4fb7c5e1b055e420c0ded9a (diff) | |
| download | otp-5cb944bf32b7b3f4ec5500710fe10c28a643e1fd.tar.gz otp-5cb944bf32b7b3f4ec5500710fe10c28a643e1fd.tar.bz2 otp-5cb944bf32b7b3f4ec5500710fe10c28a643e1fd.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Prepare release
inets: Gracefully handle bad headers
[erl_docgen] Update version
[erl_docgen] Add missing file db_funcs.xsl to file list
erts: Fix bug in system_profile
erts: Fix bug in enif_binary_to_term for immediates
Diffstat (limited to 'lib/inets/src/http_server/httpd_request.erl')
| -rw-r--r-- | lib/inets/src/http_server/httpd_request.erl | 6 |
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} |