# HG changeset patch # User Matthew Wild # Date 1261085791 0 # Node ID 1c7839fbbe9de43c3468a521022ab7ad4a8cc3f7 # Parent 66ba153d3f09a6294abc795820c4c7cc29705db8 s2smanager: Send reply stream header only after checking we serve this host (sorry darkrain... :) ) diff -r 66ba153d3f09 -r 1c7839fbbe9d core/s2smanager.lua --- a/core/s2smanager.lua Thu Dec 17 21:33:35 2009 +0000 +++ b/core/s2smanager.lua Thu Dec 17 21:36:31 2009 +0000 @@ -363,17 +363,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