aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-12-28 12:50:55 +0000
committerMatthew Wild <mwild1@gmail.com>2012-12-28 12:50:55 +0000
commit61201a751bacfdfc9e019d9801750be70cf79f46 (patch)
tree35d7ef14dde7d00aaff4d95251daa4c89df73999 /plugins
parentd93a83513252cd7e5e9d561aeac81ed425caf650 (diff)
parentb9ac1b8b07a8f0ac3c16595a544132ea6f43e998 (diff)
downloadprosody-61201a751bacfdfc9e019d9801750be70cf79f46.tar.gz
prosody-61201a751bacfdfc9e019d9801750be70cf79f46.zip
Merge 0.9->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_s2s/mod_s2s.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index 098a74bd..788a64af 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -485,6 +485,7 @@ end
function listener.ondisconnect(conn, err)
local session = sessions[conn];
if session then
+ sessions[conn] = nil;
if err and session.direction == "outgoing" and session.notopen then
(session.log or log)("debug", "s2s connection attempt failed: %s", err);
if s2sout.attempt_connection(session, err) then
@@ -494,7 +495,6 @@ function listener.ondisconnect(conn, err)
end
(session.log or log)("debug", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err or "connection closed"));
s2s_destroy_session(session, err);
- sessions[conn] = nil;
end
end