diff options
| author | Zandra <[email protected]> | 2015-11-20 10:17:10 +0100 |
|---|---|---|
| committer | Zandra <[email protected]> | 2015-11-20 10:17:10 +0100 |
| commit | 00db647274f87aa87f4bb7245fc95a1effe72466 (patch) | |
| tree | 9e19c4f3b11d9e38e1ed30b8d35e231f8aa5a2ec /lib/inets/src | |
| parent | b5e4c4533ed5e407804b825ecab65164161a0060 (diff) | |
| parent | 56025e23118f69b8d1b87b0478a93499752360cb (diff) | |
| download | otp-00db647274f87aa87f4bb7245fc95a1effe72466.tar.gz otp-00db647274f87aa87f4bb7245fc95a1effe72466.tar.bz2 otp-00db647274f87aa87f4bb7245fc95a1effe72466.zip | |
Merge branch 'weisslj/allow-whitespace-after-chunk-size' into maint
* weisslj/allow-whitespace-after-chunk-size:
inets: Allow whitespace after HTTP chunk again
OTP-13116
Diffstat (limited to 'lib/inets/src')
| -rw-r--r-- | lib/inets/src/http_lib/http_chunk.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/inets/src/http_lib/http_chunk.erl b/lib/inets/src/http_lib/http_chunk.erl index 2f8476a49d..9699856bf8 100644 --- a/lib/inets/src/http_lib/http_chunk.erl +++ b/lib/inets/src/http_lib/http_chunk.erl @@ -147,7 +147,7 @@ decode_size(Data = <<?CR, ?LF, ChunkRest/binary>>, HexList, AccHeaderSize, {MaxBodySize, Body, AccLength, MaxHeaderSize}) -> - try http_util:hexlist_to_integer(lists:reverse(HexList)) of + try http_util:hexlist_to_integer(lists:reverse(string:strip(HexList, left))) of 0 -> % Last chunk, there was no data ignore_extensions(Data, remaing_size(MaxHeaderSize, AccHeaderSize), MaxHeaderSize, {?MODULE, decode_trailer, |