Mercurial > prosody-hg
diff core/sessionmanager.lua @ 6602:61b6a4fc65f1
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 26 Mar 2015 16:48:39 +0000 |
| parents | bae84401a02c f93e1b2ec327 |
| children | 78d1706982b2 |
line wrap: on
line diff
--- a/core/sessionmanager.lua Wed Jan 21 02:55:27 2015 +0100 +++ b/core/sessionmanager.lua Thu Mar 26 16:48:39 2015 +0000 @@ -114,7 +114,7 @@ -- returns nil, err_type, err, err_message on failure function bind_resource(session, resource) if not session.username then return nil, "auth", "not-authorized", "Cannot bind resource before authentication"; end - if session.resource then return nil, "cancel", "already-bound", "Cannot bind multiple resources on a single connection"; end + if session.resource then return nil, "cancel", "not-allowed", "Cannot bind multiple resources on a single connection"; end -- We don't support binding multiple resources local event_payload = { session = session, resource = resource };