aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src
diff options
context:
space:
mode:
authorIngela Andin <[email protected]>2019-06-17 12:18:52 +0200
committerGitHub <[email protected]>2019-06-17 12:18:52 +0200
commitdc60b1db60b96f6ea300270a7fed9d82e330f86d (patch)
treedee83a0fa7e034357f67fff3d2507f5b87ad2393 /lib/inets/src
parentd156b2cdceb8b2150522ba6c5ecca8734738e55e (diff)
parent58d4a482d710d002acaabd74230922202adbc165 (diff)
downloadotp-dc60b1db60b96f6ea300270a7fed9d82e330f86d.tar.gz
otp-dc60b1db60b96f6ea300270a7fed9d82e330f86d.tar.bz2
otp-dc60b1db60b96f6ea300270a7fed9d82e330f86d.zip
Merge pull request #2206 from alehar/inets/httpd_request_parse_headers_fix
inets: httpd_request - honor RFC2616 LF only as header line terminator OTP-15893
Diffstat (limited to 'lib/inets/src')
-rw-r--r--lib/inets/src/http_server/httpd_request.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/inets/src/http_server/httpd_request.erl b/lib/inets/src/http_server/httpd_request.erl
index 9d7538a13d..f3e24263b8 100644
--- a/lib/inets/src/http_server/httpd_request.erl
+++ b/lib/inets/src/http_server/httpd_request.erl
@@ -196,9 +196,9 @@ parse_headers(<<?CR,?LF,?LF,Body/binary>>, [], [], Current, Max, Options, Result
parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, [], [], Current, Max,
Options, Result);
-parse_headers(<<?LF,?LF,Body/binary>>, [], [], Current, Max, Options, Result) ->
+parse_headers(<<?LF,?LF,Body/binary>>, Header, Headers, Current, Max, Options, Result) ->
%% If ?CR is is missing RFC2616 section-19.3
- parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, [], [], Current, Max,
+ parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, Header, Headers, Current, Max,
Options, Result);
parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, [], [], _, _, _, Result) ->