diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-04-02 17:42:22 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-04-02 17:42:22 +0100 |
| commit | 499cb87234e01044440591b90c8eb46e63d1e01a (patch) | |
| tree | 861eaefae2bd906eace48b17e5f6172dca6c8f5c /plugins | |
| parent | c98c0fb432db6ce9c7bbcd433168aa27b36854b8 (diff) | |
| parent | 27b4049481f29dcac2d6093c40ad7e8bf1ea8899 (diff) | |
| download | prosody-499cb87234e01044440591b90c8eb46e63d1e01a.tar.gz prosody-499cb87234e01044440591b90c8eb46e63d1e01a.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_compression.lua | 6 | ||||
| -rw-r--r-- | plugins/muc/muc.lib.lua | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/mod_compression.lua b/plugins/mod_compression.lua index f44e8a6d..9da5254e 100644 --- a/plugins/mod_compression.lua +++ b/plugins/mod_compression.lua @@ -125,8 +125,8 @@ end module:hook("stanza/http://jabber.org/protocol/compress:compressed", function(event) local session = event.origin; - - if session.type == "s2sout_unauthed" or session.type == "s2sout" then + + if session.type == "s2sout" then session.log("debug", "Activating compression...") -- create deflate and inflate streams local deflate_stream = get_deflate_stream(session); @@ -150,7 +150,7 @@ end); module:hook("stanza/http://jabber.org/protocol/compress:compress", function(event) local session, stanza = event.origin, event.stanza; - if session.type == "c2s" or session.type == "s2sin" or session.type == "c2s_unauthed" or session.type == "s2sin_unauthed" then + if session.type == "c2s" or session.type == "s2sin" then -- fail if we are already compressed if session.compressed then local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("setup-failed"); diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index d09c768e..8cf8d882 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -1032,7 +1032,7 @@ function room_mt:can_set_role(actor_jid, occupant_jid, role) if actor_jid == true then return true; end local actor = self._occupants[self._jid_nick[actor_jid]]; - if actor.role == "moderator" then + if actor and actor.role == "moderator" then if occupant.affiliation ~= "owner" and occupant.affiliation ~= "admin" then if actor.affiliation == "owner" or actor.affiliation == "admin" then return true; |