diff options
| author | Kim Alvefur <zash@zash.se> | 2013-02-03 15:52:27 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-02-03 15:52:27 +0100 |
| commit | 4c01dc18780c4b0b93616093c86b2c9cff3d12f2 (patch) | |
| tree | a1d3fc24abd3048cb23d45b860640a83baa8c261 /plugins/mod_s2s | |
| parent | 8c8ebcc4aeb65184408557a5d3f967dd2b0e7e51 (diff) | |
| parent | 517296667e0fa74dd441892cf9750101ae31e814 (diff) | |
| download | prosody-4c01dc18780c4b0b93616093c86b2c9cff3d12f2.tar.gz prosody-4c01dc18780c4b0b93616093c86b2c9cff3d12f2.zip | |
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_s2s')
| -rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index ad628a9b..15c89ced 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -429,6 +429,8 @@ local function initialize_session(session) 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", |