diff options
| author | Kim Alvefur <zash@zash.se> | 2016-10-07 16:52:18 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-10-07 16:52:18 +0200 |
| commit | 67c41ef89e175c064eca7d7518779aefed31c187 (patch) | |
| tree | 9043fbad3e9e1ac74e957347fedc8cca0a635106 /plugins | |
| parent | 5ebf40bbffcbd1b50d76228307ade67863c3f586 (diff) | |
| parent | 36b9149295afd0c8b48e91c82ef0a1f8ebe7f932 (diff) | |
| download | prosody-67c41ef89e175c064eca7d7518779aefed31c187.tar.gz prosody-67c41ef89e175c064eca7d7518779aefed31c187.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_carbons.lua | 4 | ||||
| -rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_s2s/s2sout.lib.lua | 4 | ||||
| -rw-r--r-- | plugins/muc/muc.lib.lua | 1 |
4 files changed, 8 insertions, 3 deletions
diff --git a/plugins/mod_carbons.lua b/plugins/mod_carbons.lua index 9ef14713..951645f8 100644 --- a/plugins/mod_carbons.lua +++ b/plugins/mod_carbons.lua @@ -1,5 +1,5 @@ -- XEP-0280: Message Carbons implementation for Prosody --- Copyright (C) 2011 Kim Alvefur +-- Copyright (C) 2011-2016 Kim Alvefur -- -- This file is MIT/X11 licensed. @@ -67,7 +67,7 @@ local function message_handler(event, c2s) elseif stanza:get_child("no-copy", "urn:xmpp:hints") then module:log("debug", "Message has no-copy hint, ignoring"); return - elseif stanza:get_child("x", "http://jabber.org/protocol/muc#user") then + elseif not c2s and bare_jid == orig_from and stanza:get_child("x", "http://jabber.org/protocol/muc#user") then module:log("debug", "MUC PM, ignoring"); return end diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index c9b6b137..00e816f7 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -389,7 +389,7 @@ function stream_callbacks._streamopened(session, attr) elseif session.direction == "outgoing" then session.notopen = nil; if not attr.id then - log("error", "Stream response from %s did not give us a stream id!", session.to_host); + log("warn", "Stream response did not give us a stream id!"); session:close({ condition = "undefined-condition", text = "Missing stream ID" }); return; end diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua index 1038a616..61d6086e 100644 --- a/plugins/mod_s2s/s2sout.lib.lua +++ b/plugins/mod_s2s/s2sout.lib.lua @@ -176,6 +176,8 @@ function s2sout.try_connect(host_session, connect_host, connect_port, err) log("debug", "DNS reply for %s gives us %s", connect_host, ip.a); IPs[#IPs+1] = new_ip(ip.a, "IPv4"); end + elseif err then + log("debug", "Error in DNS lookup: %s", err); end if have_other_result then @@ -212,6 +214,8 @@ function s2sout.try_connect(host_session, connect_host, connect_port, err) log("debug", "DNS reply for %s gives us %s", connect_host, ip.aaaa); IPs[#IPs+1] = new_ip(ip.aaaa, "IPv6"); end + elseif err then + log("debug", "Error in DNS lookup: %s", err); end if have_other_result then diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index 4ad75476..0d6e4094 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -812,6 +812,7 @@ function room_mt:destroy(newjid, reason, password) x:up(); self:clear(x); module:fire_event("muc-room-destroyed", { room = self }); + return true; end function room_mt:handle_disco_info_get_query(origin, stanza) |