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

net.http.parser: Improve handling of responses without content-length

Browse source 
This ensures that we support responses without a content-length header, and
allow streaming them through the streaming handler interface. An example of
such a response would be Server-Sent Events streams.
This commit is contained in:
Matthew Wild 2023-02-09 22:57:32 +00:00
parent 28e3b19ca1
commit 0fd88a07a4
2 changed files with 14 additions and 9 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);

6
spec/net_http_parser_spec.lua
View file

@ -87,7 +87,7 @@ o
]],
{
body = "Hello", count = 2;
body = "Hello", count = 3;
}
);
end);
@ -116,7 +116,7 @@ o
]],
{
body = "Hello", count = 3;
body = "Hello", count = 4;
}
);
end);
@ -129,7 +129,7 @@ o
assert.equal("25930f021785ae14053a322c2dbc1897c3769720", sha1(data, true), "test data malformed");
test_stream(data, {
body = string.rep("~", 11085), count = 2;
body = string.rep("~", 11085), count = 3;
});
end);
end);