# HG changeset patch # User Matthew Wild # Date 1258865582 0 # Node ID 9044e7cfefc2c420d59dec399db713c5b6d1b891 # Parent 5c1758ccf8b925fe51ee6e46cf4997351f2ac769 s2smanager: Fix syntax error introduced in merge diff -r 5c1758ccf8b9 -r 9044e7cfefc2 core/s2smanager.lua --- a/core/s2smanager.lua Sun Nov 22 04:50:42 2009 +0000 +++ b/core/s2smanager.lua Sun Nov 22 04:53:02 2009 +0000 @@ -128,7 +128,7 @@ open_sessions = open_sessions + 1; local w, log = conn.write, logger_init("s2sin"..tostring(conn):match("[a-f0-9]+$")); session.log = log; - session.sends2s = function (t) log("debug", "sending: %s", (t.top_tag and t:top_tag()) or t:match("^([^>]*>?)"); w(conn, tostring(t)); end + session.sends2s = function (t) log("debug", "sending: %s", t.top_tag and t:top_tag() or t:match("^([^>]*>?)")); w(conn, tostring(t)); end incoming_s2s[session] = true; add_task(connect_timeout, function () if session.conn ~= conn or