Software /
code /
prosody
Diff
core/sessionmanager.lua @ 644:e1b3a472ca00
Automated merge with http://waqas.ath.cx:8000/
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Thu, 25 Dec 2008 01:37:13 +0000 |
parent | 623:5af5a64a729f |
child | 694:b97b05261156 |
line wrap: on
line diff
--- a/core/sessionmanager.lua Thu Dec 25 06:35:05 2008 +0500 +++ b/core/sessionmanager.lua Thu Dec 25 01:37:13 2008 +0000 @@ -113,8 +113,6 @@ if session.resource then return nil, "cancel", "already-bound", "Cannot bind multiple resources on a single connection"; end -- We don't support binding multiple resources - session.conntimetotal = gettime()-session.conntime; - resource = resource or uuid_generate(); --FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing