aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-11-20 15:00:52 +0100
committerKim Alvefur <zash@zash.se>2014-11-20 15:00:52 +0100
commit6d35997e95d6491c72dcfc4b1ecf782e7542fbe5 (patch)
treed923b1c2b876061a9845a8e92e394815218a487a /net
parent184d6ce60b6d231f1f5524348472feb56c5cb771 (diff)
parenta5f74207fd41f6bd2d02a6a2f98216f7688b3212 (diff)
downloadprosody-6d35997e95d6491c72dcfc4b1ecf782e7542fbe5.tar.gz
prosody-6d35997e95d6491c72dcfc4b1ecf782e7542fbe5.zip
Merge 0.9->0.10
Diffstat (limited to 'net')
-rw-r--r--net/http/parser.lua12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/http/parser.lua b/net/http/parser.lua
index d896dff4..6d7187da 100644
--- a/net/http/parser.lua
+++ b/net/http/parser.lua
@@ -132,7 +132,7 @@ function httpstream.new(success_cb, error_cb, parser_type, options_cb)
state, chunk_size = nil, nil;
buf = buf:gsub("^.-\r\n\r\n", ""); -- This ensure extensions and trailers are stripped
success_cb(packet);
- elseif #buf - chunk_start + 2 >= chunk_size then -- we have a chunk
+ elseif #buf - 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);
chunk_size, chunk_start = nil, nil;
@@ -140,11 +140,11 @@ function httpstream.new(success_cb, error_cb, parser_type, options_cb)
break;
end
elseif len and #buf >= len then
- if packet.code == 101 then
- packet.body, buf = buf, ""
- else
- packet.body, buf = buf:sub(1, len), buf:sub(len + 1);
- end
+ if packet.code == 101 then
+ packet.body, buf = buf, "";
+ else
+ packet.body, buf = buf:sub(1, len), buf:sub(len + 1);
+ end
state = nil; success_cb(packet);
else
break;