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 | bd050e2b64086b818592f81606b52db8bb01309e (patch) | |
| tree | 1b780be536dea23b0e32d06cee9eeef6bc0ec5a1 /core | |
| parent | 28df9086d844e7a8ca6f26b55fe6297e044e7be7 (diff) | |
| parent | f305f2082762ad627aaf018132d81382a5206cbd (diff) | |
| download | prosody-bd050e2b64086b818592f81606b52db8bb01309e.tar.gz prosody-bd050e2b64086b818592f81606b52db8bb01309e.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 |