Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/processone/ejabberd.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2015-09-17 01:33:08 +0300
committerHolger Weiss <holger@zedat.fu-berlin.de>2015-09-17 01:33:08 +0300
commit4a4065c9c62a74a6a8b493595ac40e87f637b814 (patch)
tree6f58c04d7a472b33f071f7e29c802b2b0b342b28 /src
parent5d11a19087298d83bd7bca05da2ed188159eac52 (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/ejabberd_http_bind.erl1
-rw-r--r--src/ejabberd_http_ws.erl1
2 files changed, 2 insertions, 0 deletions
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),