aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-02-23 16:21:40 +0000
committerMatthew Wild <mwild1@gmail.com>2018-02-23 16:21:40 +0000
commitc26b05eaf27e2dc720587c0c8c4e32473acbe5b6 (patch)
tree1e03e82d8608a254758707db6e5384942d9f9f05
parenta761524e2856b41b8c42529f833accc70d10d693 (diff)
downloadprosody-c26b05eaf27e2dc720587c0c8c4e32473acbe5b6.tar.gz
prosody-c26b05eaf27e2dc720587c0c8c4e32473acbe5b6.zip
net.http: Rename handler to conn, for consistency with all our other code
-rw-r--r--net/http.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/http.lua b/net/http.lua
index cda1496c..1e2854a4 100644
--- a/net/http.lua
+++ b/net/http.lua
@@ -222,13 +222,13 @@ local function request(self, u, ex, callback)
sslctx = ex and ex.sslctx or self.options and self.options.sslctx;
end
- local handler, ret = server.addclient(host, port_number, listener, "*a", sslctx)
- if not handler then
+ local conn, ret = server.addclient(host, port_number, listener, "*a", sslctx)
+ if not conn then
self.events.fire_event("request-connection-error", { http = self, request = req, url = u, err = ret });
callback(ret, 0, req);
return nil, ret;
end
- req.conn = handler
+ req.conn = conn
req.write = function (...) return req.conn:write(...); end
req.callback = function (content, code, response, request)