X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fhttpstream.lua;h=bdc3fce776c45827ffdf7cd533d7df69dc1a4cdc;hb=e157cd13e86685e77c8ba0e9f4e97e729af8d821;hp=c96abe22f0a8999375f8e63844008e69b00f991a;hpb=4271c80aac50a85d1f89d71aa38f568a01ae08d0;p=prosody.git

diff --git a/util/httpstream.lua b/util/httpstream.lua
index c96abe22..bdc3fce7 100644
--- a/util/httpstream.lua
+++ b/util/httpstream.lua
@@ -46,7 +46,7 @@ local function parser(success_cb, parser_type, options_cb)
 			local status_line = readline();
 			local method, path, httpversion = status_line:match("^(%S+)%s+(%S+)%s+HTTP/(%S+)$");
 			if not method then coroutine.yield("invalid-status-line"); end
-			-- TODO parse url
+			path = path:gsub("^//+", "/"); -- TODO parse url more
 			local headers = readheaders();
 			
 			-- read body
@@ -67,27 +67,49 @@ 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
+			local have_body = not
+				 ( (options_cb and options_cb().method == "HEAD")
+				or (status_code == 204 or status_code == 304 or status_code == 301)
+				or (status_code >= 100 and status_code < 200) );
+			
 			local body;
-			local len = tonumber(headers["content-length"]);
-			if len then -- TODO check for invalid len
-				body = readlength(len);
-			else -- read to end
-				repeat
-					local newdata = coroutine.yield();
-					data = data..newdata;
-				until newdata == "";
-				body, data = data, "";
+			if have_body then
+				local len = tonumber(headers["content-length"]);
+				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
+						local newdata = coroutine.yield();
+						data = data..newdata;
+					until newdata == "";
+					body, data = data, "";
+				end
 			end
 			
 			success_cb({
 				code = status_code;
+				httpversion = httpversion;
+				headers = headers;
+				body = body;
+				-- COMPAT the properties below are deprecated
 				responseversion = httpversion;
 				responseheaders = headers;
-				body = body;
 			});
 		end
 	else coroutine.yield("unknown-parser-type"); end