Mercurial > prosody-hg

comparison 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
comparison
equal deleted inserted replaced
4126:5044698a9d90 4131:81636fa77cab
74 if reply and not(reply.attr.xmlns) and bouncy_stanzas[reply.name] then 74 if reply and not(reply.attr.xmlns) and bouncy_stanzas[reply.name] then
75 reply.attr.type = "error"; 75 reply.attr.type = "error";
76 reply:tag("error", {type = "cancel"}) 76 reply:tag("error", {type = "cancel"})
77 :tag("remote-server-not-found", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up(); 77 :tag("remote-server-not-found", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up();
78 if reason then 78 if reason then
79 reply:tag("text", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):text("Connection failed: "..reason):up(); 79 reply:tag("text", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"})
80 :text("Server-to-server connection failed: "..reason):up();
80 end 81 end
81 core_process_stanza(dummy, reply); 82 core_process_stanza(dummy, reply);
82 end 83 end
83 sendq[i] = nil; 84 sendq[i] = nil;
84 end 85 end