aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-12-05 12:29:21 +0100
committerKim Alvefur <zash@zash.se>2016-12-05 12:29:21 +0100
commit08a58cfdb2f6fd438fe7a00430d14c03b7caa7cb (patch)
treed8491d1afbee7ca428e0a6129a47dcdd9661dca7 /net
parent2a9484a488a5878e27b5d749b5bbb0d54f497e86 (diff)
parentb151bd4d64f0e25c7c73acca597eadcbbc1c812e (diff)
downloadprosody-08a58cfdb2f6fd438fe7a00430d14c03b7caa7cb.tar.gz
prosody-08a58cfdb2f6fd438fe7a00430d14c03b7caa7cb.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
-rw-r--r--net/websocket.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/websocket.lua b/net/websocket.lua
index a4274eec..373210d6 100644
--- a/net/websocket.lua
+++ b/net/websocket.lua
@@ -44,7 +44,7 @@ local function fail(s, code, reason)
return false
end
-function websocket_listeners.onincoming(handler, buffer, err)
+function websocket_listeners.onincoming(handler, buffer, err) -- luacheck: ignore 212/err
local s = websockets[handler];
s.readbuffer = s.readbuffer..buffer;
while true do
@@ -123,7 +123,7 @@ function websocket_listeners.onincoming(handler, buffer, err)
end
local websocket_methods = {};
-local function close_timeout_cb(now, timerid, s)
+local function close_timeout_cb(now, timerid, s) -- luacheck: ignore 212/now 212/timerid
s.close_timer = nil;
log("warn", "Close timeout waiting for server to close, closing manually.");
s.handler:close();
@@ -232,7 +232,7 @@ local function connect(url, ex, listeners)
}, websocket_metatable);
local http_url = url:gsub("^(ws)", "http");
- local http_req = http.request(http_url, {
+ local http_req = http.request(http_url, { -- luacheck: ignore 211/http_req
method = "GET";
headers = headers;
sslctx = ex.sslctx;