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 21c6887f00de8a3b782463b13e07702bf053a601..4277f4c54a52d6a4fbf0739540548a6a1a5bc442 100644 (file)
--- 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 dd6854f8c32a9d5ffda530d24c90d2b4cf4a5a9d..65a80b0046db882370b54bf09b865841b03e5514 100644 (file)
--- 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),