diff options
author | Erlang/OTP <[email protected]> | 2018-06-05 11:57:24 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2018-06-05 11:57:24 +0200 |
commit | 0914003ce3bb6cd3ddec112c44c6dd2568658f1b (patch) | |
tree | 27d8472abff8aa4a5e8d6c61c01067094897a655 /lib/inets/src/http_server/httpd_request.erl | |
parent | 813157e40027222a1b8f6d0c1df8dbc78bb8f37f (diff) | |
parent | daba7e0abe4a5642543676e966298b08dee83eb9 (diff) | |
download | otp-0914003ce3bb6cd3ddec112c44c6dd2568658f1b.tar.gz otp-0914003ce3bb6cd3ddec112c44c6dd2568658f1b.tar.bz2 otp-0914003ce3bb6cd3ddec112c44c6dd2568658f1b.zip |
Merge branch 'ingela/inets/header-handling/OTP-15092' into maint-20
* ingela/inets/header-handling/OTP-15092:
inets: Gracefully handle bad headers
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} |