diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-12-28 12:50:55 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-12-28 12:50:55 +0000 |
| commit | 93fcefee1c694c8917be74879d4d204730904e07 (patch) | |
| tree | 35d7ef14dde7d00aaff4d95251daa4c89df73999 | |
| parent | 7e132a4e4847c0dc7657970d57a57943319edc3d (diff) | |
| parent | 12e69640651233c81d34938f49052f569f60676d (diff) | |
| download | prosody-93fcefee1c694c8917be74879d4d204730904e07.tar.gz prosody-93fcefee1c694c8917be74879d4d204730904e07.zip | |
Merge 0.9->trunk
| -rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 2 |
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 |