diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-10-14 10:59:27 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-10-14 10:59:27 +0100 |
| commit | cb4ef2e67f00b3ae37603398270fb535a34fe011 (patch) | |
| tree | 453193905058adfd2efb4ed93a8ba44c6fb3c70f | |
| parent | 887f411c4e018eb2ac034e80c6477d2cd253f729 (diff) | |
| parent | 4a4ec58c8d72ad6b9670ba697b4a98d35e21e2f6 (diff) | |
| download | prosody-cb4ef2e67f00b3ae37603398270fb535a34fe011.tar.gz prosody-cb4ef2e67f00b3ae37603398270fb535a34fe011.zip | |
Merge 0.9->0.10
| -rw-r--r-- | plugins/mod_pubsub/pubsub.lib.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 2 |
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) |