aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-18 00:08:58 +0100
committerKim Alvefur <zash@zash.se>2016-03-18 00:08:58 +0100
commitf76d7cdfb91850381b47ec3abfbc280f32136682 (patch)
treed187e41d01f81f41766abe3c0a730dde7b8c029f /plugins
parenta8a26e0472703832c51ded651a1860a26b1baff7 (diff)
parent4633eb56fbfda4ba0e5d790203282f374c8a8079 (diff)
downloadprosody-f76d7cdfb91850381b47ec3abfbc280f32136682.tar.gz
prosody-f76d7cdfb91850381b47ec3abfbc280f32136682.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_register.lua2
-rw-r--r--plugins/mod_websocket.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_register.lua b/plugins/mod_register.lua
index e4b4bd51..fda717f7 100644
--- a/plugins/mod_register.lua
+++ b/plugins/mod_register.lua
@@ -187,7 +187,7 @@ local throttle_cache = new_cache(throttle_cache_size, blacklist_overflow and fun
module:log("info", "Adding ip %s to registration blacklist", ip);
blacklisted_ips[ip] = true;
end
-end);
+end or nil);
local function check_throttle(ip)
if not throttle_max then return true end
diff --git a/plugins/mod_websocket.lua b/plugins/mod_websocket.lua
index 418cd846..274e587a 100644
--- a/plugins/mod_websocket.lua
+++ b/plugins/mod_websocket.lua
@@ -275,7 +275,7 @@ function handle_request(event)
attr["xmlns:stream"] = attr["xmlns:stream"] or xmlns_streams;
end
return stanza;
- end);
+ end, -1000);
add_filter(session, "bytes/out", function(data)
return build_frame({ FIN = true, opcode = 0x01, data = tostring(data)});