mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.12->trunk

Browse source
This commit is contained in:
Matthew Wild 2023-02-09 22:58:01 +00:00
commit fbfe255e12
3 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
net/http/parser.lua
View file

@ -130,10 +130,13 @@ function httpstream.new(success_cb, error_cb, parser_type, options_cb)
partial = true;
};
end
if len and len > bodylimit then
if not len or len > bodylimit then
-- Early notification, for redirection
success_cb(packet);
if not packet.body_sink then error = true; return error_cb("content-length-limit-exceeded"); end
if not packet.body_sink and (len and len > bodylimit) then
error = true;
return error_cb("content-length-limit-exceeded");
end
end
if chunked and not packet.body_sink then
success_cb(packet);
@ -174,9 +177,11 @@ function httpstream.new(success_cb, error_cb, parser_type, options_cb)
end
elseif packet.body_sink then
local chunk = buffer:read_chunk(len);
while chunk and len > 0 do
while chunk and (not len or len > 0) do
if packet.body_sink:write(chunk) then
len = len - #chunk;
if len then
len = len - #chunk;
end
chunk = buffer:read_chunk(len);
else
error = true;
@ -188,9 +193,9 @@ function httpstream.new(success_cb, error_cb, parser_type, options_cb)
packet.partial = nil;
success_cb(packet);
end
elseif buffer:length() >= len then
elseif not len or buffer:length() >= len then -- or not len
assert(not chunked)
packet.body = buffer:read(len) or "";
packet.body = len and buffer:read(len) or buffer:read_chunk() or "";
state = nil;
packet.partial = nil;
success_cb(packet);