aboutsummaryrefslogtreecommitdiffstats
path: root/core/s2smanager.lua
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2011-01-29 04:54:08 +0500
committerWaqas Hussain <waqas20@gmail.com>2011-01-29 04:54:08 +0500
commitd76f04e84ecd78b6b9b0e2e354d51a847491fea4 (patch)
treebdd1dfe8c1990036e76b8cffc9db2dface0458ac /core/s2smanager.lua
parent3dda2fcfac6774f42c10338bfc2362ad666b9c5b (diff)
parent4e486d4ba9300c553a7a8fce15037141d48a77f5 (diff)
downloadprosody-d76f04e84ecd78b6b9b0e2e354d51a847491fea4.tar.gz
prosody-d76f04e84ecd78b6b9b0e2e354d51a847491fea4.zip
Merge 0.8->trunk
Diffstat (limited to 'core/s2smanager.lua')
-rw-r--r--core/s2smanager.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index df201e9e..0fb055cb 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -76,7 +76,8 @@ local function bounce_sendq(session, reason)
reply:tag("error", {type = "cancel"})
:tag("remote-server-not-found", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up();
if reason then
- reply:tag("text", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):text("Connection failed: "..reason):up();
+ reply:tag("text", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"})
+ :text("Server-to-server connection failed: "..reason):up();
end
core_process_stanza(dummy, reply);
end