Merge 0.6->0.7

[prosody.git] / net / http.lua

diff --git a/net/http.lua b/net/http.lua
index b03b357cbfef6f20ff4e2505a8dc6716da3c0359..0634d77391b72015f90e40571a60844c0776d776 100644 (file)
--- a/net/http.lua
+++ b/net/http.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -17,11 +17,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, xpcall, select, debug_traceback, char, format = 
+local tonumber, tostring, pairs, xpcall, select, debug_traceback, char, format =
         tonumber, tostring, pairs, xpcall, select, debug.traceback, string.char, string.format;
 
 local log = require "util.logger".init("http");
-local print = function () end
 
 module "http"
 
@@ -51,7 +50,7 @@ local function request_reader(request, data, startpos)
                return;
        end
        if request.state == "body" and request.state ~= "completed" then
-               print("Reading body...")
+               log("debug", "Reading body...")
                if not request.body then request.body = {}; request.havebodylength, request.bodylength = 0, tonumber(request.responseheaders["content-length"]); end
                if startpos then
                        data = data:sub(startpos, -1)
@@ -68,11 +67,11 @@ local function request_reader(request, data, startpos)
                                request.body = nil;
                                request.state = "completed";
                        else
-                               print("", "Have "..request.havebodylength.." bytes out of "..request.bodylength);
+                               log("debug", "Have "..request.havebodylength.." bytes out of "..request.bodylength);
                        end
                end
        elseif request.state == "headers" then
-               print("Reading headers...")
+               log("debug", "Reading headers...")
                local pos = startpos;
                local headers, headers_complete = request.responseheaders;
                if not headers then
@@ -84,12 +83,12 @@ local function request_reader(request, data, startpos)
                        local k, v = line:match("(%S+): (.+)");
                        if k and v then
                                headers[k:lower()] = v;
-                               --print("Header: "..k:lower().." = "..v);
+                               --log("debug", "Header: "..k:lower().." = "..v);
                        elseif #line == 0 then
                                headers_complete = true;
                                break;
                        else
-                               print("Unhandled header line: "..line);
+                               log("warn", "Unhandled header line: "..line);
                        end
                end
                if not headers_complete then return; end
@@ -103,7 +102,7 @@ local function request_reader(request, data, startpos)
                        return request_reader(request, data, startpos);
                end
        elseif request.state == "status" then
-               print("Reading status...")
+               log("debug", "Reading status...")
                local http, code, text, linelen = data:match("^HTTP/(%S+) (%d+) (.-)\r\n()", startpos);
                code = tonumber(code);
                if not code then
@@ -212,8 +211,9 @@ end
 
 function destroy_request(request)
        if request.conn then
-               request.handler.close()
-               listener.ondisconnect(request.conn, "closed");
+               request.conn = nil;
+               request.handler:close()
+               listener.ondisconnect(request.handler, "closed");
        end
 end