24
1
mirror of https://github.com/processone/ejabberd.git synced 2024-09-27 14:30:55 +02:00

Merge pull request #317 from weiss/xep-0198

XEP-0198: Set #state.conn field on session resume
This commit is contained in:
Evgeny Khramtsov 2014-10-13 20:38:15 +04:00
commit adaa067333

View File

@ -2943,7 +2943,8 @@ inherit_session_state(#state{user = U, server = S} = StateData, ResumeID) ->
{auth_module, StateData#state.auth_module}], {auth_module, StateData#state.auth_module}],
ejabberd_sm:open_session(NewSID, U, S, R, ejabberd_sm:open_session(NewSID, U, S, R,
Priority, Info), Priority, Info),
{ok, StateData#state{sid = NewSID, {ok, StateData#state{conn = Conn,
sid = NewSID,
jid = OldStateData#state.jid, jid = OldStateData#state.jid,
resource = OldStateData#state.resource, resource = OldStateData#state.resource,
pres_t = OldStateData#state.pres_t, pres_t = OldStateData#state.pres_t,