mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.9->0.10

Browse source
This commit is contained in:
Matthew Wild 2013-12-16 23:32:11 +00:00
commit 535e8c1102
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
net/http.lua
View file

@ -20,6 +20,7 @@ local t_insert, t_concat = table.insert, table.concat;
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");
@ -173,7 +174,7 @@ function request(u, ex, callback)
sslctx = ex and ex.sslctx or { mode = "client", protocol = "sslv23", options = { "no_sslv2" } };
end
req.handler, req.conn = server.wrapclient(conn, host, port_number, 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