# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1458256138 -3600
# Node ID 5f9c8204270f2a419c1b625c54bcd98179622c6f
# Parent  ec17486269240b34deaf90f8644ccef1fbdb6244# Parent  5f4d0753c818d40a6ba23b41fab43de535ed1a95
Merge 0.10->trunk

diff -r ec1748626924 -r 5f9c8204270f plugins/mod_register.lua
--- 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
diff -r ec1748626924 -r 5f9c8204270f plugins/mod_websocket.lua
--- 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)});