diff options
| author | Matthew Wild <mwild1@gmail.com> | 2008-12-25 01:37:13 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2008-12-25 01:37:13 +0000 |
| commit | 449e72c7363f6bb316ba516e20a79d01f8b2a558 (patch) | |
| tree | 4e99a91122be3df0e1d74e02791b9fd0fdc68087 /core/sessionmanager.lua | |
| parent | 1f5c712bcd35210ccc29e821ad367d38c8e53d1e (diff) | |
| parent | 385317309cf0ebbeddc6ebdfe7daa69a73e8f79c (diff) | |
| download | prosody-449e72c7363f6bb316ba516e20a79d01f8b2a558.tar.gz prosody-449e72c7363f6bb316ba516e20a79d01f8b2a558.zip | |
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'core/sessionmanager.lua')
| -rw-r--r-- | core/sessionmanager.lua | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index 169a6db2..963de7ce 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -113,8 +113,6 @@ function bind_resource(session, resource) 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 |