diff options
| author | Christophe Romain <christophe.romain@process-one.net> | 2015-09-18 09:06:51 +0200 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2015-09-18 09:06:51 +0200 |
| commit | 497cbb3ec29585551a191e786397ae902fb95928 (patch) | |
| tree | f148d3ff273566e5e3237b1ec9d71db4b7f9a790 /src/ejabberd_http_bind.erl | |
| parent | Remove unused functions from old get_items api (diff) | |
| parent | Guard against passing undefined C2SPid to xml parser before become_controller... (diff) | |
Merge branch 'master' of github.com:processone/ejabberd
Diffstat (limited to '')
| -rw-r--r-- | src/ejabberd_http_bind.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ejabberd_http_bind.erl b/src/ejabberd_http_bind.erl index 21c6887f..4277f4c5 100644 --- a/src/ejabberd_http_bind.erl +++ b/src/ejabberd_http_bind.erl @@ -335,6 +335,7 @@ init([Sid, Key, IP, HOpts]) -> SOpts = lists:filtermap(fun({stream_managment, _}) -> true; ({max_ack_queue, _}) -> true; ({resume_timeout, _}) -> true; + ({max_resume_timeout, _}) -> true; ({resend_on_timeout, _}) -> true; (_) -> false end, HOpts), |