aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-10-14 10:59:27 +0100
committerMatthew Wild <mwild1@gmail.com>2014-10-14 10:59:27 +0100
commit4d822c8eaf0556bc2a0e3cfd5dcb71fa8fedc9d2 (patch)
tree453193905058adfd2efb4ed93a8ba44c6fb3c70f
parentb72a485cdd1973461d1f49b66625e7f9ae0cc870 (diff)
parentdc951d561795a325328e01697f60aef0657ad5e5 (diff)
downloadprosody-4d822c8eaf0556bc2a0e3cfd5dcb71fa8fedc9d2.tar.gz
prosody-4d822c8eaf0556bc2a0e3cfd5dcb71fa8fedc9d2.zip
Merge 0.9->0.10
-rw-r--r--plugins/mod_pubsub/pubsub.lib.lua2
-rw-r--r--plugins/mod_s2s/mod_s2s.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_pubsub/pubsub.lib.lua b/plugins/mod_pubsub/pubsub.lib.lua
index 5c6054d1..d85c71be 100644
--- a/plugins/mod_pubsub/pubsub.lib.lua
+++ b/plugins/mod_pubsub/pubsub.lib.lua
@@ -18,7 +18,7 @@ local pubsub_errors = {
["nodeid-required"] = { "modify", "bad-request", nil, "nodeid-required" };
["item-not-found"] = { "cancel", "item-not-found" };
["not-subscribed"] = { "modify", "unexpected-request", nil, "not-subscribed" };
- ["forbidden"] = { "cancel", "forbidden" };
+ ["forbidden"] = { "auth", "forbidden" };
["not-allowed"] = { "cancel", "not-allowed" };
};
local function pubsub_error_reply(stanza, error)
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index a50387fb..f9165f20 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -47,7 +47,7 @@ local bouncy_stanzas = { message = true, presence = true, iq = true };
local function bounce_sendq(session, reason)
local sendq = session.sendq;
if not sendq then return; end
- session.log("info", "sending error replies for "..#sendq.." queued stanzas because of failed outgoing connection to "..tostring(session.to_host));
+ session.log("info", "Sending error replies for "..#sendq.." queued stanzas because of failed outgoing connection to "..tostring(session.to_host));
local dummy = {
type = "s2sin";
send = function(s)