From c410571ee22aa8e1e6bdce7e436e9977724d62c1 Mon Sep 17 00:00:00 2001 From: Ilya Averyanov Date: Fri, 10 Dec 2021 17:39:18 +0300 Subject: [PATCH] fix(wss): update cowboy & ranch for OTP24 compatibility --- rebar.config | 2 +- test/emqx_listeners_SUITE.erl | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/rebar.config b/rebar.config index 8a1adaef3..1e3c758e6 100644 --- a/rebar.config +++ b/rebar.config @@ -41,7 +41,7 @@ , {eredis_cluster, {git, "https://github.com/emqx/eredis_cluster", {tag, "0.6.5"}}} , {gproc, {git, "https://github.com/uwiger/gproc", {tag, "0.8.0"}}} , {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}} - , {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.8.2"}}} + , {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.0"}}} , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.0"}}} , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.8.2"}}} , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.7.0"}}} diff --git a/test/emqx_listeners_SUITE.erl b/test/emqx_listeners_SUITE.erl index f49d33004..96a2d8bb8 100644 --- a/test/emqx_listeners_SUITE.erl +++ b/test/emqx_listeners_SUITE.erl @@ -47,6 +47,12 @@ t_restart_listeners(_) -> ok = emqx_listeners:restart(), ok = emqx_listeners:stop(). +t_wss_conn(_) -> + ok = emqx_listeners:start(), + {ok, Socket} = ssl:connect({127, 0, 0, 1}, 8084, [{verify, verify_none}], 1000), + ok = ssl:close(Socket), + ok = emqx_listeners:stop(). + render_config_file() -> Path = local_path(["..", "..", "..", "..", "etc", "emqx.conf"]), {ok, Temp} = file:read_file(Path), @@ -91,4 +97,3 @@ get_base_dir(Module) -> get_base_dir() -> get_base_dir(?MODULE). -