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

net.http.parser: Expose 'partial', 'chunked' and 'body_length' on packets

Browse source
This commit is contained in:
Matthew Wild 2020-10-21 10:34:16 +01:00
parent 5b33f834fa
commit bc402b6409
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
net/http/parser.lua
View file

@ -47,6 +47,7 @@ function httpstream.new(success_cb, error_cb, parser_type, options_cb)
if state and client and not len then -- reading client body until EOF if state and client and not len then -- reading client body until EOF
buffer:collapse(); buffer:collapse();
packet.body = buffer:read_chunk() or ""; packet.body = buffer:read_chunk() or "";
packet.partial = nil;
success_cb(packet); success_cb(packet);
state = nil; state = nil;
elseif buffer:length() ~= 0 then -- unexpected EOF elseif buffer:length() ~= 0 then -- unexpected EOF
@ -96,6 +97,9 @@ function httpstream.new(success_cb, error_cb, parser_type, options_cb)
httpversion = httpversion; httpversion = httpversion;
headers = headers; headers = headers;
body = false; body = false;
body_length = len;
chunked = chunked;
partial = true;
-- COMPAT the properties below are deprecated -- COMPAT the properties below are deprecated
responseversion = httpversion; responseversion = httpversion;
responseheaders = headers; responseheaders = headers;
@ -122,6 +126,8 @@ function httpstream.new(success_cb, error_cb, parser_type, options_cb)
headers = headers; headers = headers;
body = false; body = false;
body_sink = nil; body_sink = nil;
chunked = chunked;
partial = true;
}; };
end end
if len and len > bodylimit then if len and len > bodylimit then
@ -157,6 +163,7 @@ function httpstream.new(success_cb, error_cb, parser_type, options_cb)
buf = buf:gsub("^.-\r\n\r\n", ""); -- This ensure extensions and trailers are stripped buf = buf:gsub("^.-\r\n\r\n", ""); -- This ensure extensions and trailers are stripped
buffer:write(buf); buffer:write(buf);
state, chunked = nil, nil; state, chunked = nil, nil;
packet.partial = nil;
success_cb(packet); success_cb(packet);
elseif buffer:length() - chunk_start - 2 >= chunk_size then -- we have a chunk elseif buffer:length() - chunk_start - 2 >= chunk_size then -- we have a chunk
buffer:discard(chunk_start - 1); -- TODO verify that it's not off-by-one buffer:discard(chunk_start - 1); -- TODO verify that it's not off-by-one
@ -176,11 +183,17 @@ function httpstream.new(success_cb, error_cb, parser_type, options_cb)
return error_cb("body-sink-write-failure"); return error_cb("body-sink-write-failure");
end end
end end
if len == 0 then state = nil; success_cb(packet); end if len == 0 then
state = nil;
packet.partial = nil;
success_cb(packet);
end
elseif buffer:length() >= len then elseif buffer:length() >= len then
assert(not chunked) assert(not chunked)
packet.body = buffer:read(len) or ""; packet.body = buffer:read(len) or "";
state = nil; success_cb(packet); state = nil;
packet.partial = nil;
success_cb(packet);
else else
break; break;
end end