diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2014-10-12 19:44:35 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2014-10-12 19:44:35 +0200 |
| commit | 1ccc0d8bcbb879aefe8fcba9ba23ba96eefdb103 (patch) | |
| tree | c3c5cffb8ce36938087180f5a4b8f1966a693b4f | |
| parent | Merge pull request #316 from weiss/really-require-tls (diff) | |
XEP-0198: Set #state.conn field on session resume
| -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, |