aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_websocket.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-10-11 20:03:00 +0200
committerKim Alvefur <zash@zash.se>2015-10-11 20:03:00 +0200
commit539d817c670d5eff6d52778f45200aab62afb84d (patch)
tree38ce0d5d3bebeb2cc1e63965c9492ee0a8526dc9 /plugins/mod_websocket.lua
parent03bee63e1f6cb987d43746970f83a6afb41de24e (diff)
parent3c66dcabd1962de1b9e3d5f31d76f5569124cae2 (diff)
downloadprosody-539d817c670d5eff6d52778f45200aab62afb84d.tar.gz
prosody-539d817c670d5eff6d52778f45200aab62afb84d.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_websocket.lua')
-rw-r--r--plugins/mod_websocket.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/mod_websocket.lua b/plugins/mod_websocket.lua
index d3252980..418cd846 100644
--- a/plugins/mod_websocket.lua
+++ b/plugins/mod_websocket.lua
@@ -4,9 +4,11 @@
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
+-- luacheck: ignore 431/log
module:set_global();
+local add_task = require "util.timer".add_task;
local add_filter = require "util.filters".add_filter;
local sha1 = require "util.hashes".sha1;
local base64 = require "util.encodings".base64.encode;
@@ -24,6 +26,7 @@ local parse_close = websocket_frames.parse_close;
local t_concat = table.concat;
+local stream_close_timeout = module:get_option_number("c2s_close_timeout", 5);
local consider_websocket_secure = module:get_option_boolean("consider_websocket_secure");
local cross_domain = module:get_option("cross_domain_websocket");
if cross_domain then
@@ -128,7 +131,7 @@ local function filter_open_close(data)
return data;
end
-function handle_request(event, path)
+function handle_request(event)
local request, response = event.request, event.response;
local conn = response.conn;