diff options
| author | Paweł Chmielowski <pawel@process-one.net> | 2015-04-15 10:47:10 +0200 |
|---|---|---|
| committer | Paweł Chmielowski <pawel@process-one.net> | 2015-04-15 10:47:10 +0200 |
| commit | ba69c469b551e77929bd1a6eb3fd16a82ef13687 (patch) | |
| tree | 65d0fa1dbd523c410b011bcec53bf477036c9794 /src/ejabberd_http.erl | |
| parent | Enable websocket connection in default config file (diff) | |
Remove http_poll module
For couple years browsers did limit ability to change cookies from js
for different domains, this made http_poll connections practically not
usuable. I don't think this module is used at all so it's time to put it
to rest.
Diffstat (limited to 'src/ejabberd_http.erl')
| -rw-r--r-- | src/ejabberd_http.erl | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/ejabberd_http.erl b/src/ejabberd_http.erl index a06d3f99b..4e7f4b554 100644 --- a/src/ejabberd_http.erl +++ b/src/ejabberd_http.erl @@ -56,7 +56,7 @@ %% to have the module test_web handle requests with %% paths starting with "/test/module": %% - %% {5280, ejabberd_http, [http_poll, web_admin, + %% {5280, ejabberd_http, [http_bind, web_admin, %% {request_handlers, [{["test", "module"], mod_test_web}]}]} %% request_handlers = [], @@ -135,10 +135,6 @@ init({SockMod, Socket}, Opts) -> true -> [{[<<"http-bind">>], mod_http_bind}]; false -> [] end, - Poll = case proplists:get_bool(http_poll, Opts) of - true -> [{[<<"http-poll">>], ejabberd_http_poll}]; - false -> [] - end, XMLRPC = case proplists:get_bool(xmlrpc, Opts) of true -> [{[], ejabberd_xmlrpc}]; false -> [] @@ -151,7 +147,7 @@ init({SockMod, Socket}, Opts) -> Mod} || {Path, Mod} <- Hs] end, []), RequestHandlers = DefinedHandlers ++ Captcha ++ Register ++ - Admin ++ Bind ++ Poll ++ XMLRPC, + Admin ++ Bind ++ XMLRPC, ?DEBUG("S: ~p~n", [RequestHandlers]), DefaultHost = gen_mod:get_opt(default_host, Opts, fun(A) -> A end, undefined), @@ -862,7 +858,7 @@ transform_listen_option(web_admin, Opts) -> transform_listen_option(http_bind, Opts) -> [{http_bind, true}|Opts]; transform_listen_option(http_poll, Opts) -> - [{http_poll, true}|Opts]; + Opts; transform_listen_option({request_handlers, Hs}, Opts) -> Hs1 = lists:map( fun({PList, Mod}) when is_list(PList) -> |