Mercurial > prosody-hg

diff core/s2smanager.lua @ 4131:81636fa77cab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.8->trunk
author Waqas Hussain <waqas20@gmail.com>
date Sat, 29 Jan 2011 04:54:08 +0500
parents c9363102afd2 f80b7a92da67
children e3282871dd44
line wrap: on
line diff
--- a/core/s2smanager.lua	Fri Jan 21 14:02:56 2011 +0000
+++ b/core/s2smanager.lua	Sat Jan 29 04:54:08 2011 +0500
@@ -76,7 +76,8 @@
 				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