# HG changeset patch # User Matthew Wild # Date 1261085791 0 # Node ID f8232abcab2acf14e346c65c0c1a0f288e1cf59e # Parent 87b66be6d514bf7650e111f5c0236c9d71dac1c9 s2smanager: Send reply stream header only after checking we serve this host (sorry darkrain... :) ) diff -r 87b66be6d514 -r f8232abcab2a core/s2smanager.lua --- a/core/s2smanager.lua Thu Dec 17 19:01:57 2009 +0000 +++ b/core/s2smanager.lua Thu Dec 17 21:36:31 2009 +0000 @@ -369,17 +369,17 @@ session.streamid = uuid_gen(); (session.log or log)("debug", "incoming s2s received "); - send(""); - send(stanza("stream:stream", { xmlns='jabber:server', ["xmlns:db"]='jabber:server:dialback', - ["xmlns:stream"]='http://etherx.jabber.org/streams', id=session.streamid, from=session.to_host, version=(session.version > 0 and "1.0" or nil) }):top_tag()); if session.to_host and not hosts[session.to_host] then -- Attempting to connect to a host we don't serve session:close({ condition = "host-unknown"; text = "This host does not serve "..session.to_host }); return; end + send(""); + send(stanza("stream:stream", { xmlns='jabber:server', ["xmlns:db"]='jabber:server:dialback', + ["xmlns:stream"]='http://etherx.jabber.org/streams', id=session.streamid, from=session.to_host, version=(session.version > 0 and "1.0" or nil) }):top_tag()); if session.version >= 1.0 then local features = st.stanza("stream:features"); - + if session.to_host then hosts[session.to_host].events.fire_event("s2s-stream-features", { session = session, features = features }); else