Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cowlib with ws compression fix #1541

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/src/guide/migrating_from_2.8.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion rebar.config
Original file line number Diff line number Diff line change
@@ -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]}.
8 changes: 8 additions & 0 deletions test/ws_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down