net.dns: Add 'force' parameter to resolver:feed() to force decoding a packet even...

[prosody.git] / net / http.lua

diff --git a/net/http.lua b/net/http.lua
index 09b04e619bdba53a8866d425559ae3936464cbde..11407c4d4445e8529ce921d839409567986f137a 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,17 +17,34 @@ 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 = 
-        tonumber, tostring, pairs, xpcall, select, debug.traceback, string.char, string.format;
+local pairs, ipairs = pairs, ipairs;
+local tonumber, tostring, xpcall, select, debug_traceback, char, format =
+        tonumber, tostring, xpcall, select, debug.traceback, string.char, string.format;
 
 local log = require "util.logger".init("http");
-local print = function () 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 _formencodepart(s)
+       return s and (s:gsub("%W", function (c)
+               if c ~= " " then
+                       return format("%%%02x", c:byte());
+               else
+                       return "+";
+               end
+       end));
+end
+function formencode(form)
+       local result = {};
+       for _, field in ipairs(form) do
+               t_insert(result, _formencodepart(field.name).."=".._formencodepart(field.value));
+       end
+       return t_concat(result, "&");
+end
+
 local function expectbody(reqt, code)
     if reqt.method == "HEAD" then return nil end
     if code == 204 or code == 304 or code == 301 then return nil end
@@ -51,7 +68,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 +85,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 +101,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 +120,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
@@ -165,7 +182,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
@@ -212,8 +229,9 @@ end
 
 function destroy_request(request)
        if request.conn then
-               request.handler.close()
-               listener.disconnect(request.handler, "closed");
+               request.conn = nil;
+               request.handler:close()
+               listener.ondisconnect(request.handler, "closed");
        end
 end