diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2016-08-22 21:22:08 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2016-08-22 21:22:08 +0200 |
| commit | 1bfa1c613b75a0aeeb7d0283ddfcc0711997a4d8 (patch) | |
| tree | acddfea75e2c479cda4d28582b14b7e65e23e88f /src | |
| parent | mod_muc_admin: Accept 'allow_subscription' option (diff) | |
| parent | Fixed #1260 Stream Management feature for the websocket connections (diff) | |
Merge remote-tracking branch 'processone/pr/1261'
* processone/pr/1261:
Fixed #1260 Stream Management feature for the websocket connections
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_http_ws.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ejabberd_http_ws.erl b/src/ejabberd_http_ws.erl index e66cf33a5..24554a8cc 100644 --- a/src/ejabberd_http_ws.erl +++ b/src/ejabberd_http_ws.erl @@ -112,7 +112,7 @@ socket_handoff(LocalPath, Request, Socket, SockMod, Buf, Opts) -> %%% Internal init([{#ws{ip = IP, http_opts = HOpts}, _} = WS]) -> - SOpts = lists:filtermap(fun({stream_managment, _}) -> true; + SOpts = lists:filtermap(fun({stream_management, _}) -> true; ({max_ack_queue, _}) -> true; ({resume_timeout, _}) -> true; ({max_resume_timeout, _}) -> true; |