# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1335663849 -3600
# Node ID 1537bf7f96180c13e487a0c62257006482fd5dad
# Parent  e239668aa6d22404b81957c76d500d72b2a54443# Parent  e8bd0a6f45e2788aaf8fdb73ee4c3470cf3499db
Merge with Zash

diff -r e239668aa6d2 -r 1537bf7f9618 plugins/s2s/mod_s2s.lua
--- a/plugins/s2s/mod_s2s.lua	Sun Apr 29 02:10:55 2012 +0100
+++ b/plugins/s2s/mod_s2s.lua	Sun Apr 29 02:44:09 2012 +0100
@@ -280,7 +280,7 @@
 end
 
 function stream_callbacks.streamdisconnected(session, err)
-	if err and err ~= "closed" then
+	if err and err ~= "closed" and session.direction == "outgoing" 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");