Fri, 20 Nov 2009 04:39:54 +0000
s2smanager: Queue db:verify unless we already sent a db:result (if we had then it can could a dialback deadlock). Also remove some redundant code which could cause a db:result to be sent while still negotiating features (e.g. TLS) and break things. Collectively these fix a 'random' s2s failure (usually with ejabberd for some reason) - resulting in an 'unbound prefix' XML error, or 'ssl handshake failure'. Was this commit message long enough? I think so.
-- Prosody IM -- Copyright (C) 2008-2009 Matthew Wild -- Copyright (C) 2008-2009 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. -- local st = require "util.stanza"; module:add_feature("jabber:iq:version"); local version = "the best operating system ever!"; if not module:get_option("hide_os_type") then if os.getenv("WINDIR") then version = "Windows"; else local uname = io.popen("uname"); if uname then version = uname:read("*a"); else version = "an OS"; end end end version = version:match("^%s*(.-)%s*$") or version; local query = st.stanza("query", {xmlns = "jabber:iq:version"}) :tag("name"):text("Prosody"):up() :tag("version"):text(prosody.version):up() :tag("os"):text(version); module:hook("iq/host/jabber:iq:version:query", function(event) local stanza = event.stanza; if stanza.attr.type == "get" and stanza.attr.to == module.host then event.origin.send(st.reply(stanza):add_child(query)); return true; end end);