Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Tue, 26 Jan 2016 14:15:00 +0100
changeset 7104 f83211f4d776
parent 7101 5286e79c6829 (current diff)
parent 7103 301d58705667 (diff)
child 7105 250016f5eb7e
child 7109 74798480b52e
Merge 0.9->0.10
plugins/mod_c2s.lua file | annotate | diff | comparison | revisions
plugins/mod_s2s/mod_s2s.lua file | annotate | diff | comparison | revisions 
--- a/plugins/mod_c2s.lua	Fri Jan 22 14:49:05 2016 +0100
+++ b/plugins/mod_c2s.lua	Tue Jan 26 14:15:00 2016 +0100
@@ -313,7 +313,7 @@
 	for _, session in pairs(sessions) do
 		session:close{ condition = "system-shutdown", text = reason };
 	end
-end, 1000);
+end, -100);
 
 
 
--- a/plugins/mod_s2s/mod_s2s.lua	Fri Jan 22 14:49:05 2016 +0100
+++ b/plugins/mod_s2s/mod_s2s.lua	Tue Jan 26 14:15:00 2016 +0100
@@ -680,7 +680,7 @@
 	for _, session in pairs(sessions) do
 		session:close{ condition = "system-shutdown", text = reason };
 	end
-end,500);
+end, -200);
prosody