umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-14 12:20:24 +00:00
Code Issues Wiki Activity

Fix h2spec "invalid preface sequence" test

Browse source 
Introduce a currently undocumented option to allow disabling
cowboy_http when using a clear listener.
This commit is contained in:
Loïc Hoguin 2020-04-01 18:02:59 +02:00
parent bcef70818b
commit a8a2689727
No known key found for this signature in database
GPG key ID: 8A9DF795F6FED764
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/cowboy_clear.erl
View file

@ -41,7 +41,16 @@ connection_process(Parent, Ref, Transport, Opts) ->
undefined undefined
end, end,
{ok, Socket} = ranch:handshake(Ref), {ok, Socket} = ranch:handshake(Ref),
init(Parent, Ref, Socket, Transport, ProxyInfo, Opts, cowboy_http). %% Use cowboy_http2 directly only when 'http' is missing.
%% Otherwise switch to cowboy_http2 from cowboy_http.
%%
%% @todo Extend this option to cowboy_tls and allow disabling
%% the switch to cowboy_http2 in cowboy_http. Also document it.
Protocol = case maps:get(protocols, Opts, [http2, http]) of
[http2] -> cowboy_http2;
[_|_] -> cowboy_http
end,
init(Parent, Ref, Socket, Transport, ProxyInfo, Opts, Protocol).
init(Parent, Ref, Socket, Transport, ProxyInfo, Opts, Protocol) -> init(Parent, Ref, Socket, Transport, ProxyInfo, Opts, Protocol) ->
_ = case maps:get(connection_type, Opts, supervisor) of _ = case maps:get(connection_type, Opts, supervisor) of

2
test/h2spec_SUITE.erl
View file

@ -36,6 +36,8 @@ init_per_suite(Config) ->
cowboy_test:init_http(h2spec, #{ cowboy_test:init_http(h2spec, #{
env => #{dispatch => init_dispatch()}, env => #{dispatch => init_dispatch()},
max_concurrent_streams => 100, max_concurrent_streams => 100,
%% This test suite expects an HTTP/2-only connection.
protocols => [http2],
%% Disable the DATA threshold for this test suite. %% Disable the DATA threshold for this test suite.
stream_window_data_threshold => 0 stream_window_data_threshold => 0
}, Config) }, Config)