aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-02-19 02:58:34 +0000
committerMatthew Wild <mwild1@gmail.com>2010-02-19 02:58:34 +0000
commit1e2242d3194b34c8451985dec895d30217a82d2f (patch)
tree063cffc97b6133bbd57695352a1ef85dcc3c0649
parent5cb8c4b615b2ca3844d3f6a9a11ed3748d3c5977 (diff)
downloadprosody-1e2242d3194b34c8451985dec895d30217a82d2f.tar.gz
prosody-1e2242d3194b34c8451985dec895d30217a82d2f.zip
net.http: Port commit 2f235c57d713 to net.http to fix headers in responses (thanks dersd)
-rw-r--r--net/http.lua19
1 files changed, 14 insertions, 5 deletions
diff --git a/net/http.lua b/net/http.lua
index 67da59de..c1cfae02 100644
--- a/net/http.lua
+++ b/net/http.lua
@@ -73,22 +73,31 @@ local function request_reader(request, data, startpos)
elseif request.state == "headers" then
print("Reading headers...")
local pos = startpos;
- local headers = request.responseheaders or {};
+ local headers, headers_complete = request.responseheaders;
+ if not headers then
+ headers = {};
+ request.responseheaders = headers;
+ end
for line in data:sub(startpos, -1):gmatch("(.-)\r\n") do
startpos = startpos + #line + 2;
local k, v = line:match("(%S+): (.+)");
if k and v then
headers[k:lower()] = v;
- print("Header: "..k:lower().." = "..v);
+ --print("Header: "..k:lower().." = "..v);
elseif #line == 0 then
- request.responseheaders = headers;
+ headers_complete = true;
break;
else
print("Unhandled header line: "..line);
end
end
+ if not headers_complete then return; end
-- Reached the end of the headers
- request.state = "body";
+ if not expectbody(request, request.code) then
+ request.callback(nil, request.code, request);
+ return;
+ end
+ request.state = "body";
if #data > startpos then
return request_reader(request, data, startpos);
end
@@ -102,7 +111,7 @@ local function request_reader(request, data, startpos)
request.code, request.responseversion = code, http;
- if request.onlystatus or not expectbody(request, code) then
+ if request.onlystatus then
if request.callback then
request.callback(nil, code, request);
end