Software / code / prosody
Diff
plugins/mod_s2s/mod_s2s.lua @ 5321:33813f000015
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 03 Feb 2013 15:52:27 +0100 |
| parent | 5307:d80e56d8805c |
| child | 5341:760c22c822be |
line wrap: on
line diff
--- a/plugins/mod_s2s/mod_s2s.lua Tue Jan 22 08:30:38 2013 +0500 +++ b/plugins/mod_s2s/mod_s2s.lua Sun Feb 03 15:52:27 2013 +0100 @@ -429,6 +429,8 @@ add_task(connect_timeout, function () if session.type == "s2sin" or session.type == "s2sout" then return; -- Ok, we're connected + elseif session.type == "s2s_destroyed" then + return; -- Session already destroyed end -- Not connected, need to close session and clean up (session.log or log)("debug", "Destroying incomplete session %s->%s due to inactivity",
