From f81d945625dd9afada0438b6177c5570bdf1dd45 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 17 Dec 2009 21:17:47 +0000 Subject: s2smanager: Mark stream as opened sooner, this prevents a duplicated stream header on host-unknown errors (thanks darkrain and his mail server) --- core/s2smanager.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'core/s2smanager.lua') diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 2ea645fb..1d1e4696 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -366,6 +366,7 @@ function streamopened(session, attr) 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 @@ function streamopened(session, attr) end end end - - session.notopen = nil; end function streamclosed(session) -- cgit v1.2.3