Merge 0.10->trunk

[prosody.git] / net / http.lua

diff --git a/net/http.lua b/net/http.lua
index 80011b59f59b6f2da584a36aa0b6bc42683b51e3..669fa9a561ffbaecf88ec0adb90e67cf719b8f4a 100644 (file)
--- a/net/http.lua
+++ b/net/http.lua
@@ -6,7 +6,6 @@
 -- COPYING file in the source package for more information.
 --
 
-local socket = require "socket"
 local b64 = require "util.encodings".base64.encode;
 local url = require "socket.url"
 local httpstream_new = require "net.http.parser".new;
@@ -28,6 +27,8 @@ local _ENV = nil;
 
 local requests = {}; -- Open requests
 
+local function make_id(req) return (tostring(req):match("%x+$")); end
+
 local listener = { default_port = 80, default_mode = "*a" };
 
 function listener.onconnect(conn)
@@ -114,6 +115,13 @@ local function request_reader(request, data, err)
 end
 
 local function handleerr(err) log("error", "Traceback[http]: %s", traceback(tostring(err), 2)); end
+local function log_if_failed(id, ret, ...)
+       if not ret then
+               log("error", "Request %s: error in callback: %s", id, tostring((...)));
+       end
+       return ...;
+end
+
 local function request(u, ex, callback)
        local req = url.parse(u);
 
@@ -126,6 +134,8 @@ local function request(u, ex, callback)
                req.path = "/";
        end
 
+       req.id = ex and ex.id or make_id(req);
+
        local method, headers, body;
 
        local host, port = req.host, req.port;
@@ -162,6 +172,8 @@ local function request(u, ex, callback)
                end
        end
 
+       log("debug", "Making %s %s request %s to %s", req.scheme, method or "GET", req.id, (ex and ex.suppress_url and host_header) or u);
+
        -- Attach to request object
        req.method, req.headers, req.body = method, headers, body;
 
@@ -171,24 +183,23 @@ local function request(u, ex, callback)
        end
        local port_number = port and tonumber(port) or (using_https and 443 or 80);
 
-       -- Connect the socket, and wrap it with net.server
-       local conn = socket.tcp();
-       conn:settimeout(10);
-       local ok, err = conn:connect(host, port_number);
-       if not ok and err ~= "timeout" then
-               callback(nil, 0, req);
-               return nil, err;
-       end
-
        local sslctx = false;
        if using_https then
                sslctx = ex and ex.sslctx or { mode = "client", protocol = "sslv23", options = { "no_sslv2", "no_sslv3" } };
        end
 
-       req.handler, req.conn = assert(server.wrapclient(conn, host, port_number, listener, "*a", sslctx));
+       local handler, conn = server.addclient(host, port_number, listener, "*a", sslctx)
+       if not handler then
+               callback(nil, 0, req);
+               return nil, conn;
+       end
+       req.handler, req.conn = handler, conn
        req.write = function (...) return req.handler:write(...); end
 
-       req.callback = function (content, code, request, response) log("debug", "Calling callback, status %s", code or "---"); return select(2, xpcall(function () return callback(content, code, request, response) end, handleerr)); end
+       req.callback = function (content, code, request, response)
+               log("debug", "request %s: Calling callback, status %s", req.id, code or "---");
+               return log_if_failed(req.id, xpcall(function () return callback(content, code, request, response) end, handleerr));
+       end
        req.reader = request_reader;
        req.state = "status";