Retagging 0.3.0, used up my mistake quota for today

[prosody.git] / net / http.lua

diff --git a/net/http.lua b/net/http.lua
index 38db0c0df2f6ebce0130301fc017465182fba7d2..1ecbf41079f4ee6837e2178cb675b933efa74fbe 100644 (file)
--- a/net/http.lua
+++ b/net/http.lua
@@ -9,7 +9,10 @@ local connlisteners_get = require "net.connlisteners".get;
 local listener = connlisteners_get("httpclient") or error("No httpclient listener!");
 
 local t_insert, t_concat = table.insert, table.concat;
-local tonumber, tostring, pairs = tonumber, tostring, pairs;
+local tonumber, tostring, pairs, xpcall, select, debug_traceback = 
+        tonumber, tostring, pairs, xpcall, select, debug.traceback;
+
+local log = require "util.logger".init("http");
 local print = function () end
 
 local urlcodes = setmetatable({}, { __index = function (t, k) t[k] = char(tonumber("0x"..k)); return t[k]; end });
@@ -27,15 +30,18 @@ end
 local function request_reader(request, data, startpos)
        if not data then
                if request.body then
+                       log("debug", "Connection closed, but we have data, calling callback...");
                        request.callback(t_concat(request.body), request.code, request);
-               else
+               elseif request.state ~= "completed" then
                        -- Error.. connection was closed prematurely
                        request.callback("connection-closed", 0, request);
                end
                destroy_request(request);
+               request.body = nil;
+               request.state = "completed";
                return;
        end
-       if request.state == "body" then
+       if request.state == "body" and request.state ~= "completed" then
                print("Reading body...")
                if not request.body then request.body = {}; request.havebodylength, request.bodylength = 0, tonumber(request.responseheaders["content-length"]); end
                if startpos then
@@ -46,11 +52,15 @@ local function request_reader(request, data, startpos)
                        request.havebodylength = request.havebodylength + #data;
                        if request.havebodylength >= request.bodylength then
                                -- We have the body
+                               log("debug", "Have full body, calling callback");
                                if request.callback then
                                        request.callback(t_concat(request.body), request.code, request);
                                end
+                               request.body = nil;
+                               request.state = "completed";
+                       else
+                               print("", "Have "..request.havebodylength.." bytes out of "..request.bodylength);
                        end
-                       print("", "Have "..request.havebodylength.." bytes out of "..request.bodylength);
                end
        elseif request.state == "headers" then
                print("Reading headers...")
@@ -100,6 +110,7 @@ local function request_reader(request, data, startpos)
        end
 end
 
+local function handleerr(err) log("error", "Traceback[http]: %s: %s", tostring(err), debug_traceback()); end
 function request(u, ex, callback)
        local req = url.parse(u);
        
@@ -112,7 +123,7 @@ function request(u, ex, callback)
        end
        
        if ex then
-               custom_headers = ex.custom_headers;
+               custom_headers = ex.headers;
                req.onlystatus = ex.onlystatus;
                body = ex.body;
                if body then
@@ -123,7 +134,7 @@ function request(u, ex, callback)
                if ex.method then req.method = ex.method; end
        end
        
-       req.handler, req.conn = server.wraptcpclient(listener, socket.tcp(), req.host, req.port or 80, 0, "*a");
+       req.handler, req.conn = server.wrapclient(socket.tcp(), req.host, req.port or 80, listener, "*a");
        req.write = req.handler.write;
        req.conn:settimeout(0);
        local ok, err = req.conn:connect(req.host, req.port or 80);
@@ -131,7 +142,14 @@ function request(u, ex, callback)
                return nil, err;
        end
        
-       req.write((req.method or "GET ")..req.path.." HTTP/1.0\r\n");
+       local request_line = { req.method or "GET", " ", req.path, " HTTP/1.1\r\n" };
+       
+       if req.query then
+               t_insert(request_line, 4, "?");
+               t_insert(request_line, 5, req.query);
+       end
+       
+       req.write(t_concat(request_line));
        local t = { [2] = ": ", [4] = "\r\n" };
        if custom_headers then
                for k, v in pairs(custom_headers) do
@@ -152,9 +170,9 @@ function request(u, ex, callback)
                req.write(body);
        end
        
-       req.callback = callback;
+       req.callback = function (content, code, request) log("debug", "Calling callback, status %s", code or "---"); return select(2, xpcall(function () return callback(content, code, request) end, handleerr)); end
        req.reader = request_reader;
-       req.state = "status"
+       req.state = "status";
        
        listener.register_request(req.handler, req);