aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-03-08 00:18:16 +0000
committerMatthew Wild <mwild1@gmail.com>2012-03-08 00:18:16 +0000
commit152c4a280fdf2881b1fa157e4d8ca93b7b701d20 (patch)
treeef01615ca08cc6b1d47e102db045435c22cee1a2 /plugins
parent75bc6dcc563eeefa564e653f363748c0f4f7fb0e (diff)
parentc779ee4b9a029c14d23b71afe65b9462c097633a (diff)
downloadprosody-152c4a280fdf2881b1fa157e4d8ca93b7b701d20.tar.gz
prosody-152c4a280fdf2881b1fa157e4d8ca93b7b701d20.zip
Merge with Maranda
Diffstat (limited to 'plugins')
-rw-r--r--plugins/s2s/mod_s2s.lua3
1 files changed, 1 insertions, 2 deletions
diff --git a/plugins/s2s/mod_s2s.lua b/plugins/s2s/mod_s2s.lua
index 5d1d61c4..aa4d5d56 100644
--- a/plugins/s2s/mod_s2s.lua
+++ b/plugins/s2s/mod_s2s.lua
@@ -280,7 +280,6 @@ function stream_callbacks.streamdisconnected(session, err)
end
end
(session.log or log)("info", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err or "closed"));
- sessions[session.conn] = nil;
s2s_destroy_session(session, err);
end
@@ -457,7 +456,7 @@ function listener.ondisconnect(conn, err)
return; -- Connection lives, for now
end
end
- sessions[conn] = nil;
+ sessions[conn] = nil;
end
function listener.register_outgoing(conn, session)