diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-07-08 18:49:44 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-07-08 18:49:44 +0100 |
| commit | 158ead42cf434bb38735bf529c3c61d6ee45e1b0 (patch) | |
| tree | 1b780be536dea23b0e32d06cee9eeef6bc0ec5a1 /core | |
| parent | 2fcd8af884edb9278d2c0cb770c879c43badd2c2 (diff) | |
| parent | 9726ab31dbf3a4874ce78e1bd5174f80a366cdd5 (diff) | |
| download | prosody-158ead42cf434bb38735bf529c3c61d6ee45e1b0.tar.gz prosody-158ead42cf434bb38735bf529c3c61d6ee45e1b0.zip | |
Merge 0.9->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/s2smanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 9e0a91d1..5fe3a375 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -133,7 +133,7 @@ local resting_session = { -- Resting, not dead function retire_session(session, reason) local log = session.log or log; for k in pairs(session) do - if k ~= "trace" and k ~= "log" and k ~= "id" then + if k ~= "trace" and k ~= "log" and k ~= "id" and k ~= "conn" then session[k] = nil; end end |