diff options
| author | Evgeny Khramtsov <xramtsov@gmail.com> | 2015-07-21 12:36:01 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <xramtsov@gmail.com> | 2015-07-21 12:36:01 +0300 |
| commit | 531638e946244ea46e0b296d620f3510b3e4a1d4 (patch) | |
| tree | b95a7c7a12e32967d58461216cdd35e9cfb02a1d /src | |
| parent | Merge pull request #618 from weiss/muc-message-hook (diff) | |
| parent | XEP-0198: Increase timeout during resumption (diff) | |
Merge pull request #632 from weiss/increase-max-ack-queue
XEP-0198: Increase default value of "max_ack_queue" option
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_c2s.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 3869bd54..f982f911 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -308,7 +308,7 @@ init([{SockMod, Socket}, Opts]) -> MaxAckQueue = case proplists:get_value(max_ack_queue, Opts) of Limit when is_integer(Limit), Limit > 0 -> Limit; infinity -> infinity; - _ -> 500 + _ -> 1000 end, ResumeTimeout = case proplists:get_value(resume_timeout, Opts) of Timeout when is_integer(Timeout), Timeout >= 0 -> Timeout; @@ -3010,7 +3010,7 @@ inherit_session_state(#state{user = U, server = S} = StateData, ResumeID) -> end. resume_session({Time, PID}) -> - (?GEN_FSM):sync_send_all_state_event(PID, {resume_session, Time}, 3000). + (?GEN_FSM):sync_send_all_state_event(PID, {resume_session, Time}, 5000). make_resume_id(StateData) -> {Time, _} = StateData#state.sid, |