diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-06-09 01:11:12 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-06-09 01:11:12 +0100 |
| commit | 061df0df373dc555e0b9e4c9c6ca022f3905f9de (patch) | |
| tree | 026f9f66b877f2868515a023775c5fccfdc68fb6 | |
| parent | 1357c719b98ae25b8cc593005371d59dc5182c4d (diff) | |
| parent | 8736c7f83f55f7b2b8c7c74ac7f9af14254a7f80 (diff) | |
| download | prosody-061df0df373dc555e0b9e4c9c6ca022f3905f9de.tar.gz prosody-061df0df373dc555e0b9e4c9c6ca022f3905f9de.zip | |
Merge 0.7->trunk
| -rw-r--r-- | plugins/mod_announce.lua | 1 | ||||
| -rw-r--r-- | plugins/mod_compression.lua | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/xep227toprosody.lua | 0 |
3 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({ diff --git a/tools/xep227toprosody.lua b/tools/xep227toprosody.lua index 313b2194..313b2194 100644..100755 --- a/tools/xep227toprosody.lua +++ b/tools/xep227toprosody.lua |