aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-08-26 16:57:53 +0200
committerKim Alvefur <zash@zash.se>2016-08-26 16:57:53 +0200
commitc56203a9f3350ec3be63d67f965cd67c2683d81b (patch)
tree2151226ea95bb3a632b411087eb5cc28f6c81ded
parent7d3b1e694e18c205c20ceed6ec9f3bf46f26efbb (diff)
parenta206b98c0ebebc15626b55c83e66e64cfab7c673 (diff)
downloadprosody-c56203a9f3350ec3be63d67f965cd67c2683d81b.tar.gz
prosody-c56203a9f3350ec3be63d67f965cd67c2683d81b.zip
Merge 0.10->trunk
-rw-r--r--net/http/parser.lua4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/http/parser.lua b/net/http/parser.lua
index fabbddad..96d32ec8 100644
--- a/net/http/parser.lua
+++ b/net/http/parser.lua
@@ -134,6 +134,9 @@ function httpstream.new(success_cb, error_cb, parser_type, options_cb)
if state then -- read body
if client then
if chunked then
+ if chunk_start and buflen - chunk_start - 2 < chunk_size then
+ return;
+ end -- not enough data
if buftable then buf, buftable = t_concat(buf), false; end
if not buf:find("\r\n", nil, true) then
return;
@@ -150,6 +153,7 @@ function httpstream.new(success_cb, error_cb, parser_type, options_cb)
elseif buflen - chunk_start - 2 >= chunk_size then -- we have a chunk
packet.body = packet.body..buf:sub(chunk_start, chunk_start + (chunk_size-1));
buf = buf:sub(chunk_start + chunk_size + 2);
+ buflen = buflen - (chunk_start + chunk_size + 2 - 1);
chunk_size, chunk_start = nil, nil;
else -- Partial chunk remaining
break;