# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1330100745 0
# Node ID e0c4ac7749a60eccbe7962577671ce3d1519f31d
# Parent  09255a10fdfa420f0779dab0e16b93210d5ffdcf# Parent  4c24bb949e73bd9b95ac95543382c9c588689edb
Merge backout

diff -r 09255a10fdfa -r e0c4ac7749a6 plugins/s2s/mod_s2s.lua
--- a/plugins/s2s/mod_s2s.lua	Fri Feb 24 16:23:46 2012 +0000
+++ b/plugins/s2s/mod_s2s.lua	Fri Feb 24 16:25:45 2012 +0000
@@ -247,7 +247,7 @@
 end
 
 function stream_callbacks.streamdisconnected(session, err)
-	if err and err ~= "stream closed" then
+	if err and err ~= "closed" then
 		(session.log or log)("debug", "s2s connection attempt failed: %s", err);
 		if s2sout.attempt_connection(session, err) then
 			(session.log or log)("debug", "...so we're going to try another target");
@@ -255,7 +255,7 @@
 		end
 	end
 	(session.log or log)("info", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err or "closed"));
-	if session.con then sessions[session.conn] = nil; else (session.log or log)("debug", "stale session's connection already closed"); end
+	sessions[session.conn]  = nil;
 	s2s_destroy_session(session, err);
 end