diff options
| author | Matthew Wild <mwild1@gmail.com> | 2017-07-28 23:47:38 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2017-07-28 23:47:38 +0100 |
| commit | ab793182e77752bd08cf0347a95298312693563b (patch) | |
| tree | 3d0d78194ab5828d67c07bac2f07209054155de9 /core | |
| parent | aca11d8afe0573dd1573356bd14edd4bb823a187 (diff) | |
| parent | 8049a9c15fdbf78f0284240ef532e90228e6d4ad (diff) | |
| download | prosody-ab793182e77752bd08cf0347a95298312693563b.tar.gz prosody-ab793182e77752bd08cf0347a95298312693563b.zip | |
Merge 0.10 -> trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/sessionmanager.lua | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index 9ec05539..e9771c58 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -188,10 +188,14 @@ local function bind_resource(session, resource) local err; session.roster, err = rm_load_roster(session.username, session.host); if err then + -- FIXME: Why is all this rollback down here, instead of just doing the roster test up above? full_sessions[session.full_jid] = nil; hosts[session.host].sessions[session.username].sessions[resource] = nil; session.full_jid = nil; session.resource = nil; + if session.type == "c2s" then + session.type = "c2s_unbound"; + end if next(bare_sessions[session.username..'@'..session.host].sessions) == nil then bare_sessions[session.username..'@'..session.host] = nil; hosts[session.host].sessions[session.username] = nil; |