diff options
| author | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-04-01 16:53:28 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-04-01 16:53:28 +0300 |
| commit | ed2abe471ab31ec0b1cf6a5a51322118ffa10472 (patch) | |
| tree | 36b7e07370b2dcf6a72d174bbcb517ad37f40609 /src/ejabberd_http.erl | |
| parent | Fix issue with creating HostMatch in mod_mam_sql (diff) | |
Rename listening callback from start/2 to start/3
This will prevent conflicts in callback names in mod_mqtt
Old callback function is still supported.
Diffstat (limited to 'src/ejabberd_http.erl')
| -rw-r--r-- | src/ejabberd_http.erl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ejabberd_http.erl b/src/ejabberd_http.erl index c226dba1..9588e6cd 100644 --- a/src/ejabberd_http.erl +++ b/src/ejabberd_http.erl @@ -30,12 +30,12 @@ -author('alexey@process-one.net'). %% External exports --export([start/2, start_link/2, +-export([start/3, start_link/3, accept/1, receive_headers/1, recv_file/2, transform_listen_option/2, listen_opt_type/1, listen_options/0]). --export([init/2, opt_type/1]). +-export([init/3, opt_type/1]). -include("logger.hrl"). -include("xmpp.hrl"). @@ -89,17 +89,17 @@ -define(SEND_BUF, 65536). -define(MAX_POST_SIZE, 20971520). %% 20Mb -start(SockData, Opts) -> +start(SockMod, Socket, Opts) -> {ok, proc_lib:spawn(ejabberd_http, init, - [SockData, Opts])}. + [SockMod, Socket, Opts])}. -start_link(SockData, Opts) -> +start_link(SockMod, Socket, Opts) -> {ok, proc_lib:spawn_link(ejabberd_http, init, - [SockData, Opts])}. + [SockMod, Socket, Opts])}. -init({SockMod, Socket}, Opts) -> +init(SockMod, Socket, Opts) -> TLSEnabled = proplists:get_bool(tls, Opts), TLSOpts1 = lists:filter(fun ({ciphers, _}) -> true; ({dhfile, _}) -> true; |