Software / code / prosody
Changeset
6473:7c8f58d2b331
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 14 Oct 2014 10:59:27 +0100 |
| parents | 6470:67501b5576d3 (current diff) 6472:acae6289e0a6 (diff) |
| children | 6474:ee13d7dfa988 6486:64146196b142 |
| files | plugins/mod_pubsub/pubsub.lib.lua plugins/mod_s2s/mod_s2s.lua |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_pubsub/pubsub.lib.lua Mon Oct 13 21:02:04 2014 +0200 +++ b/plugins/mod_pubsub/pubsub.lib.lua Tue Oct 14 10:59:27 2014 +0100 @@ -18,7 +18,7 @@ ["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)
--- a/plugins/mod_s2s/mod_s2s.lua Mon Oct 13 21:02:04 2014 +0200 +++ b/plugins/mod_s2s/mod_s2s.lua Tue Oct 14 10:59:27 2014 +0100 @@ -47,7 +47,7 @@ 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)
