diff options
| author | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-10-13 20:38:15 +0400 |
|---|---|---|
| committer | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-10-13 20:38:15 +0400 |
| commit | adaa06733391ff219a727a0a8f632a79de102eb9 (patch) | |
| tree | dbdd974b0ef616b5baa36da1e959a1260bd14743 /src | |
| parent | Merge pull request #318 from weiss/remove-xmlrpc-dep (diff) | |
| parent | XEP-0198: Set #state.conn field on session resume (diff) | |
Merge pull request #317 from weiss/xep-0198
XEP-0198: Set #state.conn field on session resume
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_c2s.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 1591e6ffa..ad00e89bd 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -2943,7 +2943,8 @@ inherit_session_state(#state{user = U, server = S} = StateData, ResumeID) -> {auth_module, StateData#state.auth_module}], ejabberd_sm:open_session(NewSID, U, S, R, Priority, Info), - {ok, StateData#state{sid = NewSID, + {ok, StateData#state{conn = Conn, + sid = NewSID, jid = OldStateData#state.jid, resource = OldStateData#state.resource, pres_t = OldStateData#state.pres_t, |