aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-06-09 01:11:12 +0100
committerMatthew Wild <mwild1@gmail.com>2010-06-09 01:11:12 +0100
commit061df0df373dc555e0b9e4c9c6ca022f3905f9de (patch)
tree026f9f66b877f2868515a023775c5fccfdc68fb6 /plugins
parent1357c719b98ae25b8cc593005371d59dc5182c4d (diff)
parent8736c7f83f55f7b2b8c7c74ac7f9af14254a7f80 (diff)
downloadprosody-061df0df373dc555e0b9e4c9c6ca022f3905f9de.tar.gz
prosody-061df0df373dc555e0b9e4c9c6ca022f3905f9de.zip
Merge 0.7->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_announce.lua1
-rw-r--r--plugins/mod_compression.lua1
2 files changed, 0 insertions, 2 deletions
diff --git a/plugins/mod_announce.lua b/plugins/mod_announce.lua
index 7f08a6e0..d3017f6c 100644
--- a/plugins/mod_announce.lua
+++ b/plugins/mod_announce.lua
@@ -22,7 +22,6 @@ function handle_announcement(data)
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
diff --git a/plugins/mod_compression.lua b/plugins/mod_compression.lua
index 0e1aab8c..689a322f 100644
--- a/plugins/mod_compression.lua
+++ b/plugins/mod_compression.lua
@@ -96,7 +96,6 @@ end
-- 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({