diff options
| author | Matthew Wild <mwild1@gmail.com> | 2008-12-24 23:19:48 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2008-12-24 23:19:48 +0000 |
| commit | 385317309cf0ebbeddc6ebdfe7daa69a73e8f79c (patch) | |
| tree | 64b10323c12d2a274f12b6901d22317fffc45fb1 /core/sessionmanager.lua | |
| parent | 483f3cd6d6eb2b8591f0cff404b78e6f88cf4987 (diff) | |
| parent | 8661b3a502e85126500cb4a05d509ec85bc3c24d (diff) | |
| download | prosody-385317309cf0ebbeddc6ebdfe7daa69a73e8f79c.tar.gz prosody-385317309cf0ebbeddc6ebdfe7daa69a73e8f79c.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 |