prosody
5a4e766a3577%3Aba5388966742

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

3203:ba5388966742

Merge trunk/MattJ->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 09 Jun 2010 01:11:46 +0100
parents 3202:1a8a5b89a5ad (diff) 3198:5a4e766a3577 (current diff)
children 3204:7a15cbf23c5b
files
diffstat 2 files changed, 0 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/mod_announce.lua	Tue Jun 08 16:21:14 2010 +0500
+++ b/plugins/mod_announce.lua	Wed Jun 09 01:11:46 2010 +0100
@@ -22,7 +22,6 @@
 	if not is_admin(stanza.attr.from) then
 		-- Not an admin? Not allowed!
 		module:log("warn", "Non-admin %s tried to send server announcement", tostring(jid.bare(stanza.attr.from)));
-		origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
 		return;
 	end
 	
--- a/plugins/mod_compression.lua	Tue Jun 08 16:21:14 2010 +0500
+++ b/plugins/mod_compression.lua	Wed Jun 09 01:11:46 2010 +0100
@@ -96,7 +96,6 @@
 -- setup compression for a stream
 local function setup_compression(session, deflate_stream)
 	add_filter(session, "bytes/out", function(t)
-		session.log(t)
 		local status, compressed, eof = pcall(deflate_stream, tostring(t), 'sync');
 		if status == false then
 			session:close({