local server = require "net.server"
local t_insert, t_concat = table.insert, table.concat;
-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 pairs = pairs;
+local tonumber, tostring, xpcall, select, traceback =
+ tonumber, tostring, xpcall, select, debug.traceback;
+local assert, error = assert, error
local log = require "util.logger".init("http");
requests[conn] = nil;
end
+function listener.ondetach(conn)
+ requests[conn] = nil;
+end
+
local function request_reader(request, data, err)
if not request.parser then
local function error_cb(reason)
request.parser:feed(data);
end
-local function handleerr(err) log("error", "Traceback[http]: %s: %s", tostring(err), debug_traceback()); end
+local function handleerr(err) log("error", "Traceback[http]: %s", traceback(tostring(err), 2)); end
function request(u, ex, callback)
local req = url.parse(u);
local method, headers, body;
+ local host, port = req.host, req.port;
+ local host_header = host;
+ if (port == "80" and req.scheme == "http")
+ or (port == "443" and req.scheme == "https") then
+ port = nil;
+ elseif port then
+ host_header = host_header..":"..port;
+ end
+
headers = {
- ["Host"] = req.host;
+ ["Host"] = host_header;
["User-Agent"] = "Prosody XMPP Server";
};
if using_https and not ssl_available then
error("SSL not available, unable to contact https URL");
end
- local port = tonumber(req.port) or (using_https and 443 or 80);
+ 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(req.host, port);
+ local ok, err = conn:connect(host, port_number);
if not ok and err ~= "timeout" then
callback(nil, 0, req);
return nil, err;
local sslctx = false;
if using_https then
- sslctx = ex and ex.sslctx or { mode = "client", protocol = "sslv23", options = { "no_sslv2" } };
+ sslctx = ex and ex.sslctx or { mode = "client", protocol = "sslv23", options = { "no_sslv2", "no_sslv3" } };
end
- req.handler, req.conn = server.wrapclient(conn, req.host, port, listener, "*a", sslctx);
+ req.handler, req.conn = assert(server.wrapclient(conn, host, port_number, listener, "*a", sslctx));
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