Merge 0.6->0.7

[prosody.git] / net / http.lua

diff --git a/net/http.lua b/net/http.lua
index 0910944ed1642d39a1f105329ceb39619faf115c..0634d77391b72015f90e40571a60844c0776d776 100644 (file)
--- a/net/http.lua
+++ b/net/http.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- 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.
+--
+
 
 local socket = require "socket"
 local mime = require "mime"
@@ -9,19 +17,19 @@ 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 = 
-        tonumber, tostring, pairs, xpcall, select, debug.traceback;
+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
-
-local urlencode = function (s) return s and (s:gsub("%W", function (c) return string.format("%%%02x", c:byte()); end)); end
 
 module "http"
 
+function urlencode(s) return s and (s:gsub("%W", function (c) return format("%%%02x", c:byte()); end)); end
+function urldecode(s) return s and (s:gsub("%%(%x%x)", function (c) return char(tonumber(c,16)); end)); end
+
 local function expectbody(reqt, code)
     if reqt.method == "HEAD" then return nil end
-    if code == 204 or code == 304 then return nil end
+    if code == 204 or code == 304 or code == 301 then return nil end
     if code >= 100 and code < 200 then return nil end
     return 1
 end
@@ -34,6 +42,7 @@ local function request_reader(request, data, startpos)
                elseif request.state ~= "completed" then
                        -- Error.. connection was closed prematurely
                        request.callback("connection-closed", 0, request);
+                       return;
                end
                destroy_request(request);
                request.body = nil;
@@ -41,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)
@@ -58,42 +67,54 @@ 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 = 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);
+                               --log("debug", "Header: "..k:lower().." = "..v);
                        elseif #line == 0 then
-                               request.responseheaders = headers;
+                               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
                -- 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
        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
-                       return request.callback("invalid-status-line", 0, request);
+                       log("warn", "Invalid HTTP status line, telling callback then closing");
+                       local ret = request.callback("invalid-status-line", 0, request);
+                       destroy_request(request);
+                       return ret;
                end
                
                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
@@ -143,7 +164,7 @@ function request(u, ex, callback)
        end
        
        req.handler, req.conn = server.wrapclient(socket.tcp(), req.host, req.port or 80, listener, "*a");
-       req.write = req.handler.write;
+       req.write = function (...) return req.handler:write(...); end
        req.conn:settimeout(0);
        local ok, err = req.conn:connect(req.host, req.port or 80);
        if not ok and err ~= "timeout" then
@@ -190,8 +211,9 @@ end
 
 function destroy_request(request)
        if request.conn then
-               request.handler.close()
-               listener.disconnect(request.conn, "closed");
+               request.conn = nil;
+               request.handler:close()
+               listener.ondisconnect(request.handler, "closed");
        end
 end