diff --git a/Makefile b/Makefile index 2930a492..aa686fa4 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ CT_OPTS += -ct_hooks cowboy_ct_hook [] # -boot start_sasl LOCAL_DEPS = crypto DEPS = cowlib ranch -dep_cowlib = git https://github.com/ninenines/cowlib 2.11.0 +dep_cowlib = git https://github.com/ninenines/cowlib 2.11.1 dep_ranch = git https://github.com/ninenines/ranch 1.8.0 DOC_DEPS = asciideck diff --git a/doc/src/guide/migrating_from_2.8.asciidoc b/doc/src/guide/migrating_from_2.8.asciidoc index a3a0e7c2..d6a213bb 100644 --- a/doc/src/guide/migrating_from_2.8.asciidoc +++ b/doc/src/guide/migrating_from_2.8.asciidoc @@ -32,7 +32,7 @@ Cowboy 2.9 requires Erlang/OTP 22.0 or greater. * Update Ranch to 1.8.0. -* Update Cowlib to 2.11.0. +* Update Cowlib to 2.11.1. === Bugs fixed diff --git a/rebar.config b/rebar.config index 15323433..bbf5ec35 100644 --- a/rebar.config +++ b/rebar.config @@ -1,4 +1,4 @@ {deps, [ -{cowlib,".*",{git,"https://github.com/ninenines/cowlib","2.11.0"}},{ranch,".*",{git,"https://github.com/ninenines/ranch","1.8.0"}} +{cowlib,".*",{git,"https://github.com/ninenines/cowlib","2.11.1"}},{ranch,".*",{git,"https://github.com/ninenines/ranch","1.8.0"}} ]}. {erl_opts, [debug_info,warn_export_vars,warn_shadow_vars,warn_obsolete_guard,warn_missing_spec,warn_untyped_record]}. diff --git a/test/ws_SUITE.erl b/test/ws_SUITE.erl index 9abeacaa..a4c9c59b 100644 --- a/test/ws_SUITE.erl +++ b/test/ws_SUITE.erl @@ -247,6 +247,14 @@ ws_deflate_opts_client_max_window_bits_override(Config) -> = lists:keyfind("sec-websocket-extensions", 1, Headers2), ok. +ws_deflate_opts_client_max_window_bits_only_in_server(Config) -> + doc("Handler does not support compression if configured with client " + "max window bits less than 15 when client does not provide the option."), + {ok, _, Headers} = do_handshake("/ws_deflate_opts?client_max_window_bits", + "Sec-WebSocket-Extensions: permessage-deflate\r\n", Config), + false = lists:keyfind("sec-websocket-extensions", 1, Headers), + ok. + ws_deflate_opts_server_context_takeover(Config) -> doc("Handler is configured with server context takeover enabled."), {ok, _, Headers1} = do_handshake("/ws_deflate_opts?server_context_takeover",