X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fhttpstream.lua;h=4b5060a1a6835e1303a463af5d2a9d0d8474c636;hb=0ef23c673d1d620c9c1cc3e8aed43add63634426;hp=1aad0d916413b775c4b8b04584d65b1a19c2a69a;hpb=81c3f36b542816494b6181128cce9d34c8017760;p=prosody.git

diff --git a/util/httpstream.lua b/util/httpstream.lua
index 1aad0d91..4b5060a1 100644
--- a/util/httpstream.lua
+++ b/util/httpstream.lua
@@ -67,7 +67,8 @@ local function parser(success_cb, parser_type, options_cb)
 			-- read status line
 			local status_line = readline();
 			local httpversion, status_code, reason_phrase = status_line:match("^HTTP/(%S+)%s+(%d%d%d)%s+(.*)$");
-			if not httpversion then coroutine.yield("invalid-status-line"); end
+			status_code = tonumber(status_code);
+			if not status_code then coroutine.yield("invalid-status-line"); end
 			local headers = readheaders();
 			
 			-- read body
@@ -79,7 +80,18 @@ local function parser(success_cb, parser_type, options_cb)
 			local body;
 			if have_body then
 				local len = tonumber(headers["content-length"]);
-				if len then -- TODO check for invalid len
+				if headers["transfer-encoding"] == "chunked" then
+					body = "";
+					while true do
+						local chunk_size = readline():match("^%x+");
+						if not chunk_size then coroutine.yield("invalid-chunk-size"); end
+						chunk_size = tonumber(chunk_size, 16)
+						if chunk_size == 0 then break; end
+						body = body..readlength(chunk_size);
+						if readline() ~= "" then coroutine.yield("invalid-chunk-ending"); end
+					end
+					local trailers = readheaders();
+				elseif len then -- TODO check for invalid len
 					body = readlength(len);
 				else -- read to end
 					repeat