# HG changeset patch # User Matthew Wild # Date 1261084667 0 # Node ID 78c5cb163ea912b3634ed84ae4c92ff76032c0f7 # Parent c5faafa89f50515c7f19898853eff15f1baca3a7 s2smanager: Mark stream as opened sooner, this prevents a duplicated stream header on host-unknown errors (thanks darkrain and his mail server) diff -r c5faafa89f50 -r 78c5cb163ea9 core/s2smanager.lua --- a/core/s2smanager.lua Thu Dec 17 21:14:44 2009 +0000 +++ b/core/s2smanager.lua Thu Dec 17 21:17:47 2009 +0000 @@ -366,6 +366,7 @@ 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()); + session.notopen = nil; 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 }); @@ -412,8 +413,6 @@ end end end - - session.notopen = nil; end function streamclosed(session)