Mercurial > lxmppd-hg-xmllex / changeset
changeset
Merge 0.7->trunk
Wed, 09 Jun 2010 01:11:12 +0100
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Wed, 09 Jun 2010 01:11:12 +0100
- changeset 3201
- 1a8a5b89a5ad
- parent 3197
- f1db45e89317 (current diff)
- parent 3200
- ea80531e5cbc (diff)
- child 3203
- ba5388966742
Merge 0.7->trunk
| plugins/mod_compression.lua | file | annotate | diff | comparison | revisions |
--- a/plugins/mod_announce.lua Mon Jun 07 12:21:57 2010 +0100 +++ b/plugins/mod_announce.lua Wed Jun 09 01:11:12 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 Mon Jun 07 12:21:57 2010 +0100 +++ b/plugins/mod_compression.lua Wed Jun 09 01:11:12 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({
