Merge 0.10->trunk

diff --git a/plugins/mod_register.lua b/plugins/mod_register.lua
index e4b4bd51e0679a642cf70511adefceb34cf3f182..fda717f723cdb7be53abdc0a314de9b0a63dd487 100644 (file)
--- 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 418cd84639f0aa07df2ec6d3d9c512103eeee6be..274e587a1ca1fdcc6204491906c1a66ddad127ff 100644 (file)
--- 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)});