# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1356699055 0
# Node ID 03dc0ae2749934bb28ba495def86a413d7e908d2
# Parent  746f07d280e2450baa87ff3b91783f0414a0f7af# Parent  0d08c09658243280dd8487298d9bd7d9d8e107ed
Merge 0.9->trunk

diff -r 746f07d280e2 -r 03dc0ae27499 plugins/mod_s2s/mod_s2s.lua
--- a/plugins/mod_s2s/mod_s2s.lua	Fri Dec 28 03:03:56 2012 +0100
+++ b/plugins/mod_s2s/mod_s2s.lua	Fri Dec 28 12:50:55 2012 +0000
@@ -485,6 +485,7 @@
 function listener.ondisconnect(conn, err)
 	local session = sessions[conn];
 	if session then
+		sessions[conn] = nil;
 		if err and session.direction == "outgoing" and session.notopen then
 			(session.log or log)("debug", "s2s connection attempt failed: %s", err);
 			if s2sout.attempt_connection(session, err) then
@@ -494,7 +495,6 @@
 		end
 		(session.log or log)("debug", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err or "connection closed"));
 		s2s_destroy_session(session, err);
-		sessions[conn] = nil;
 	end
 end