From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Wed, 16 Sep 2015 22:33:08 +0000 (+0200)
Subject: Let BOSH/WebSocket support "max_resume_timeout"
X-Git-Tag: 15.09~25^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a4065c9c62a74a6a8b493595ac40e87f637b814;p=ejabberd

Let BOSH/WebSocket support "max_resume_timeout"

Allow for specifying the "max_resume_timeout" option in an ejabberd_http
listener for ejabberd_http_bind and/or ejabberd_http_ws.
---

diff --git a/src/ejabberd_http_bind.erl b/src/ejabberd_http_bind.erl
index 21c6887f0..4277f4c54 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),
diff --git a/src/ejabberd_http_ws.erl b/src/ejabberd_http_ws.erl
index dd6854f8c..65a80b004 100644
--- a/src/ejabberd_http_ws.erl
+++ b/src/ejabberd_http_ws.erl
@@ -115,6 +115,7 @@ init([{#ws{ip = IP, http_opts = HOpts}, _} = WS]) ->
     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),