Software / code / prosody
Changeset
7295:5f9c8204270f
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 18 Mar 2016 00:08:58 +0100 |
| parents | 7292:ec1748626924 (current diff) 7294:5f4d0753c818 (diff) |
| children | 7302:92d86016e1e3 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_register.lua Thu Mar 17 19:16:43 2016 +0000 +++ b/plugins/mod_register.lua Fri Mar 18 00:08:58 2016 +0100 @@ -187,7 +187,7 @@ 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
--- a/plugins/mod_websocket.lua Thu Mar 17 19:16:43 2016 +0000 +++ b/plugins/mod_websocket.lua Fri Mar 18 00:08:58 2016 +0100 @@ -275,7 +275,7 @@ 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)});
