Merge 0.9->0.10

diff --git a/plugins/mod_pubsub/pubsub.lib.lua b/plugins/mod_pubsub/pubsub.lib.lua
index 5c6054d17143e3080cff889266d326624137c73d..d85c71be6db35a554965b49b4ae7622eefd4ad90 100644 (file)
--- 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 a50387fb4cb5921193b5124b549956246bafef38..f9165f20288f7b21a9e3b918c9aed15fffa38c54 100644 (file)
--- 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)