aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--doc/src/guide/getting_started.asciidoc2
-rw-r--r--doc/src/guide/listeners.asciidoc4
-rw-r--r--doc/src/guide/routing.asciidoc2
-rw-r--r--doc/src/manual/cowboy.start_clear.asciidoc21
-rw-r--r--doc/src/manual/cowboy.start_tls.asciidoc21
-rw-r--r--doc/src/manual/cowboy_http.asciidoc2
-rw-r--r--doc/src/manual/cowboy_http2.asciidoc2
-rw-r--r--doc/src/manual/cowboy_router.compile.asciidoc2
-rw-r--r--examples/chunked_hello_world/src/chunked_hello_world_app.erl2
-rw-r--r--examples/compress_response/src/compress_response_app.erl2
-rw-r--r--examples/cookie/src/cookie_app.erl2
-rw-r--r--examples/echo_get/src/echo_get_app.erl2
-rw-r--r--examples/echo_post/src/echo_post_app.erl2
-rw-r--r--examples/eventsource/src/eventsource_app.erl2
-rw-r--r--examples/file_server/src/file_server_app.erl2
-rw-r--r--examples/hello_world/src/hello_world_app.erl2
-rw-r--r--examples/markdown_middleware/src/markdown_middleware_app.erl2
-rw-r--r--examples/rest_basic_auth/src/rest_basic_auth_app.erl2
-rw-r--r--examples/rest_hello_world/src/rest_hello_world_app.erl2
-rw-r--r--examples/rest_pastebin/src/rest_pastebin_app.erl2
-rw-r--r--examples/ssl_hello_world/src/ssl_hello_world_app.erl2
-rw-r--r--examples/upload/src/upload_app.erl2
-rw-r--r--examples/websocket/src/websocket_app.erl2
-rw-r--r--rebar.config2
-rw-r--r--src/cowboy.erl20
-rw-r--r--test/cowboy_test.erl6
-rw-r--r--test/http2_SUITE.erl2
-rw-r--r--test/http_SUITE.erl8
-rw-r--r--test/ws_SUITE.erl2
30 files changed, 45 insertions, 83 deletions
diff --git a/Makefile b/Makefile
index 54c86f7..d8f7adb 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ LOCAL_DEPS = crypto
DEPS = cowlib ranch
dep_cowlib = git https://github.com/ninenines/cowlib master
-dep_ranch = git https://github.com/ninenines/ranch 1.3.0
+dep_ranch = git https://github.com/ninenines/ranch 1.4.0
DOC_DEPS = asciideck
diff --git a/doc/src/guide/getting_started.asciidoc b/doc/src/guide/getting_started.asciidoc
index 7fb787d..29a406b 100644
--- a/doc/src/guide/getting_started.asciidoc
+++ b/doc/src/guide/getting_started.asciidoc
@@ -99,7 +99,7 @@ start(_Type, _Args) ->
Dispatch = cowboy_router:compile([
{'_', [{"/", hello_handler, []}]}
]),
- {ok, _} = cowboy:start_clear(my_http_listener, 100,
+ {ok, _} = cowboy:start_clear(my_http_listener,
[{port, 8080}],
#{env => #{dispatch => Dispatch}}
),
diff --git a/doc/src/guide/listeners.asciidoc b/doc/src/guide/listeners.asciidoc
index 7d5faec..d905c68 100644
--- a/doc/src/guide/listeners.asciidoc
+++ b/doc/src/guide/listeners.asciidoc
@@ -31,7 +31,7 @@ start(_Type, _Args) ->
Dispatch = cowboy_router:compile([
{'_', [{"/", hello_handler, []}]}
]),
- {ok, _} = cowboy:start_clear(my_http_listener, 100,
+ {ok, _} = cowboy:start_clear(my_http_listener,
[{port, 8080}],
#{env => #{dispatch => Dispatch}}
),
@@ -75,7 +75,7 @@ start(_Type, _Args) ->
Dispatch = cowboy_router:compile([
{'_', [{"/", hello_handler, []}]}
]),
- {ok, _} = cowboy:start_tls(my_http_listener, 100,
+ {ok, _} = cowboy:start_tls(my_http_listener,
[
{port, 8443},
{certfile, "/path/to/certfile"},
diff --git a/doc/src/guide/routing.asciidoc b/doc/src/guide/routing.asciidoc
index dec089a..2d8a1f2 100644
--- a/doc/src/guide/routing.asciidoc
+++ b/doc/src/guide/routing.asciidoc
@@ -203,7 +203,7 @@ Dispatch = cowboy_router:compile([
{'_', [{'_', my_handler, #{}}]}
]),
%% Name, NbAcceptors, TransOpts, ProtoOpts
-cowboy:start_clear(my_http_listener, 100,
+cowboy:start_clear(my_http_listener,
[{port, 8080}],
#{env => #{dispatch => Dispatch}}
).
diff --git a/doc/src/manual/cowboy.start_clear.asciidoc b/doc/src/manual/cowboy.start_clear.asciidoc
index e119fc3..7a12a58 100644
--- a/doc/src/manual/cowboy.start_clear.asciidoc
+++ b/doc/src/manual/cowboy.start_clear.asciidoc
@@ -9,7 +9,6 @@ cowboy:start_clear - Listen for connections using plain TCP
[source,erlang]
----
start_clear(Name :: ranch:ref(),
- NumAcceptors :: non_neg_integer(),
TransportOpts :: ranch_tcp:opts(),
ProtocolOpts :: opts())
-> {ok, ListenerPid :: pid()}
@@ -34,22 +33,6 @@ updating the routes defined.
It can be any Erlang term. An atom is generally good enough,
for example `api`, `my_app_clear` or `my_app_tls`.
-NumAcceptors::
-
-The number of acceptors is the number of processes that
-will accept connections. Tweak this value to improve the
-accept rate for incoming connections.
-+
-The ideal value is between 10 and 100 on most systems.
-Larger values may have the opposite effect and reduce the
-accept rate. It's generally safe to start with a value of
-100 (or 10 on low memory systems). Then, when accept rates
-become a concern, measure the performance and update the
-value accordingly.
-+
-This value is unrelated to the maximum number of concurrent
-connections.
-
TransportOpts::
The transport options are where the TCP options, including
@@ -102,7 +85,7 @@ Dispatch = cowboy_router:compile([
]}
]),
-{ok, _} = cowboy:start_clear(example, 100, [{port, 8080}], #{
+{ok, _} = cowboy:start_clear(example, [{port, 8080}], #{
env => #{dispatch => Dispatch}
}).
----
@@ -112,7 +95,7 @@ Dispatch = cowboy_router:compile([
----
Name = example,
-{ok, _} = cowboy:start_clear(Name, 100, [], #{
+{ok, _} = cowboy:start_clear(Name, [], #{
env => #{dispatch => Dispatch}
}),
diff --git a/doc/src/manual/cowboy.start_tls.asciidoc b/doc/src/manual/cowboy.start_tls.asciidoc
index f5e7fb4..1cf87c9 100644
--- a/doc/src/manual/cowboy.start_tls.asciidoc
+++ b/doc/src/manual/cowboy.start_tls.asciidoc
@@ -9,7 +9,6 @@ cowboy:start_tls - Listen for connections using TLS
[source,erlang]
----
start_tls(Name :: ranch:ref(),
- NumAcceptors :: non_neg_integer(),
TransportOpts :: ranch_ssl:opts(),
ProtocolOpts :: opts())
-> {ok, ListenerPid :: pid()}
@@ -33,22 +32,6 @@ updating the routes defined.
It can be any Erlang term. An atom is generally good enough,
for example `api`, `my_app_clear` or `my_app_tls`.
-NumAcceptors::
-
-The number of acceptors is the number of processes that
-will accept connections. Tweak this value to improve the
-accept rate for incoming connections.
-+
-The ideal value is between 10 and 100 on most systems.
-Larger values may have the opposite effect and reduce the
-accept rate. It's generally safe to start with a value of
-100 (or 10 on low memory systems). Then, when accept rates
-become a concern, measure the performance and update the
-value accordingly.
-+
-This value is unrelated to the maximum number of concurrent
-connections.
-
TransportOpts::
The transport options are where the TCP options, including
@@ -102,7 +85,7 @@ Dispatch = cowboy_router:compile([
]}
]),
-{ok, _} = cowboy:start_tls(example, 100, [
+{ok, _} = cowboy:start_tls(example, [
{port, 8443},
{cert, "path/to/cert.pem"}
], #{
@@ -115,7 +98,7 @@ Dispatch = cowboy_router:compile([
----
Name = example,
-{ok, _} = cowboy:start_tls(Name, 100, [
+{ok, _} = cowboy:start_tls(Name, [
{cert, "path/to/cert.pem"}
], #{
env => #{dispatch => Dispatch}
diff --git a/doc/src/manual/cowboy_http.asciidoc b/doc/src/manual/cowboy_http.asciidoc
index 45d5464..0c67d9e 100644
--- a/doc/src/manual/cowboy_http.asciidoc
+++ b/doc/src/manual/cowboy_http.asciidoc
@@ -38,7 +38,7 @@ opts() :: #{
Configuration for the HTTP/1.1 protocol.
This configuration is passed to Cowboy when starting listeners
-using `cowboy:start_clear/4` or `cowboy:start_tls/4` functions.
+using `cowboy:start_clear/3` or `cowboy:start_tls/3` functions.
It can be updated without restarting listeners using the
Ranch functions `ranch:get_protocol_options/1` and
diff --git a/doc/src/manual/cowboy_http2.asciidoc b/doc/src/manual/cowboy_http2.asciidoc
index d966459..517879f 100644
--- a/doc/src/manual/cowboy_http2.asciidoc
+++ b/doc/src/manual/cowboy_http2.asciidoc
@@ -30,7 +30,7 @@ opts() :: #{
Configuration for the HTTP/2 protocol.
This configuration is passed to Cowboy when starting listeners
-using `cowboy:start_clear/4` or `cowboy:start_tls/4` functions.
+using `cowboy:start_clear/3` or `cowboy:start_tls/3` functions.
It can be updated without restarting listeners using the
Ranch functions `ranch:get_protocol_options/1` and
diff --git a/doc/src/manual/cowboy_router.compile.asciidoc b/doc/src/manual/cowboy_router.compile.asciidoc
index ab4eddc..f0b3f14 100644
--- a/doc/src/manual/cowboy_router.compile.asciidoc
+++ b/doc/src/manual/cowboy_router.compile.asciidoc
@@ -43,7 +43,7 @@ Dispatch = cowboy_router:compile([
]}
]),
-{ok, _} = cowboy:start_clear(example, 100, [{port, 8080}], #{
+{ok, _} = cowboy:start_clear(example, [{port, 8080}], #{
env => #{dispatch => Dispatch}
}).
----
diff --git a/examples/chunked_hello_world/src/chunked_hello_world_app.erl b/examples/chunked_hello_world/src/chunked_hello_world_app.erl
index fe66908..20abf6e 100644
--- a/examples/chunked_hello_world/src/chunked_hello_world_app.erl
+++ b/examples/chunked_hello_world/src/chunked_hello_world_app.erl
@@ -16,7 +16,7 @@ start(_Type, _Args) ->
{"/", toppage_handler, []}
]}
]),
- {ok, _} = cowboy:start_clear(http, 100, [{port, 8080}], #{
+ {ok, _} = cowboy:start_clear(http, [{port, 8080}], #{
env => #{dispatch => Dispatch}
}),
chunked_hello_world_sup:start_link().
diff --git a/examples/compress_response/src/compress_response_app.erl b/examples/compress_response/src/compress_response_app.erl
index aed2e69..c5fdbf6 100644
--- a/examples/compress_response/src/compress_response_app.erl
+++ b/examples/compress_response/src/compress_response_app.erl
@@ -16,7 +16,7 @@ start(_Type, _Args) ->
{"/", toppage_handler, []}
]}
]),
- {ok, _} = cowboy:start_clear(http, 100, [{port, 8080}], #{
+ {ok, _} = cowboy:start_clear(http, [{port, 8080}], #{
env => #{dispatch => Dispatch},
stream_handlers => [cowboy_compress_h, cowboy_stream_h]
}),
diff --git a/examples/cookie/src/cookie_app.erl b/examples/cookie/src/cookie_app.erl
index 8ce7fdd..8301d17 100644
--- a/examples/cookie/src/cookie_app.erl
+++ b/examples/cookie/src/cookie_app.erl
@@ -16,7 +16,7 @@ start(_Type, _Args) ->
{'_', toppage_handler, []}
]}
]),
- {ok, _} = cowboy:start_clear(http, 100, [{port, 8080}], #{
+ {ok, _} = cowboy:start_clear(http, [{port, 8080}], #{
env => #{dispatch => Dispatch}
}),
cookie_sup:start_link().
diff --git a/examples/echo_get/src/echo_get_app.erl b/examples/echo_get/src/echo_get_app.erl
index b9e0d31..39fefd6 100644
--- a/examples/echo_get/src/echo_get_app.erl
+++ b/examples/echo_get/src/echo_get_app.erl
@@ -16,7 +16,7 @@ start(_Type, _Args) ->
{"/", toppage_handler, []}
]}
]),
- {ok, _} = cowboy:start_clear(http, 100, [{port, 8080}], #{
+ {ok, _} = cowboy:start_clear(http, [{port, 8080}], #{
env => #{dispatch => Dispatch}
}),
echo_get_sup:start_link().
diff --git a/examples/echo_post/src/echo_post_app.erl b/examples/echo_post/src/echo_post_app.erl
index 9bb7591..2c39336 100644
--- a/examples/echo_post/src/echo_post_app.erl
+++ b/examples/echo_post/src/echo_post_app.erl
@@ -16,7 +16,7 @@ start(_Type, _Args) ->
{"/", toppage_handler, []}
]}
]),
- {ok, _} = cowboy:start_clear(http, 100, [{port, 8080}], #{
+ {ok, _} = cowboy:start_clear(http, [{port, 8080}], #{
env => #{dispatch => Dispatch}
}),
echo_post_sup:start_link().
diff --git a/examples/eventsource/src/eventsource_app.erl b/examples/eventsource/src/eventsource_app.erl
index a5f4289..b83a276 100644
--- a/examples/eventsource/src/eventsource_app.erl
+++ b/examples/eventsource/src/eventsource_app.erl
@@ -17,7 +17,7 @@ start(_Type, _Args) ->
{"/", cowboy_static, {priv_file, eventsource, "index.html"}}
]}
]),
- {ok, _} = cowboy:start_clear(http, 100, [{port, 8080}], #{
+ {ok, _} = cowboy:start_clear(http, [{port, 8080}], #{
env => #{dispatch => Dispatch}
}),
eventsource_sup:start_link().
diff --git a/examples/file_server/src/file_server_app.erl b/examples/file_server/src/file_server_app.erl
index 49924ba..3f51855 100644
--- a/examples/file_server/src/file_server_app.erl
+++ b/examples/file_server/src/file_server_app.erl
@@ -19,7 +19,7 @@ start(_Type, _Args) ->
]}}
]}
]),
- {ok, _} = cowboy:start_clear(http, 100, [{port, 8080}], #{
+ {ok, _} = cowboy:start_clear(http, [{port, 8080}], #{
env => #{dispatch => Dispatch},
middlewares => [cowboy_router, directory_lister, cowboy_handler]
}),
diff --git a/examples/hello_world/src/hello_world_app.erl b/examples/hello_world/src/hello_world_app.erl
index 0e4438b..dc1bd17 100644
--- a/examples/hello_world/src/hello_world_app.erl
+++ b/examples/hello_world/src/hello_world_app.erl
@@ -16,7 +16,7 @@ start(_Type, _Args) ->
{"/", toppage_handler, []}
]}
]),
- {ok, _} = cowboy:start_clear(http, 100, [{port, 8080}], #{
+ {ok, _} = cowboy:start_clear(http, [{port, 8080}], #{
env => #{dispatch => Dispatch}
}),
hello_world_sup:start_link().
diff --git a/examples/markdown_middleware/src/markdown_middleware_app.erl b/examples/markdown_middleware/src/markdown_middleware_app.erl
index 06253bf..819fd53 100644
--- a/examples/markdown_middleware/src/markdown_middleware_app.erl
+++ b/examples/markdown_middleware/src/markdown_middleware_app.erl
@@ -16,7 +16,7 @@ start(_Type, _Args) ->
{"/[...]", cowboy_static, {priv_dir, markdown_middleware, ""}}
]}
]),
- {ok, _} = cowboy:start_clear(http, 100, [{port, 8080}], #{
+ {ok, _} = cowboy:start_clear(http, [{port, 8080}], #{
env => #{dispatch => Dispatch},
middlewares => [cowboy_router, markdown_converter, cowboy_handler]
}),
diff --git a/examples/rest_basic_auth/src/rest_basic_auth_app.erl b/examples/rest_basic_auth/src/rest_basic_auth_app.erl
index cc1718d..b8562bb 100644
--- a/examples/rest_basic_auth/src/rest_basic_auth_app.erl
+++ b/examples/rest_basic_auth/src/rest_basic_auth_app.erl
@@ -16,7 +16,7 @@ start(_Type, _Args) ->
{"/", toppage_handler, []}
]}
]),
- {ok, _} = cowboy:start_clear(http, 100, [{port, 8080}], #{
+ {ok, _} = cowboy:start_clear(http, [{port, 8080}], #{
env => #{dispatch => Dispatch}
}),
rest_basic_auth_sup:start_link().
diff --git a/examples/rest_hello_world/src/rest_hello_world_app.erl b/examples/rest_hello_world/src/rest_hello_world_app.erl
index f966029..e89f633 100644
--- a/examples/rest_hello_world/src/rest_hello_world_app.erl
+++ b/examples/rest_hello_world/src/rest_hello_world_app.erl
@@ -16,7 +16,7 @@ start(_Type, _Args) ->
{"/", toppage_handler, []}
]}
]),
- {ok, _} = cowboy:start_clear(http, 100, [{port, 8080}], #{
+ {ok, _} = cowboy:start_clear(http, [{port, 8080}], #{
env => #{dispatch => Dispatch}
}),
rest_hello_world_sup:start_link().
diff --git a/examples/rest_pastebin/src/rest_pastebin_app.erl b/examples/rest_pastebin/src/rest_pastebin_app.erl
index 98ffe84..31ceff3 100644
--- a/examples/rest_pastebin/src/rest_pastebin_app.erl
+++ b/examples/rest_pastebin/src/rest_pastebin_app.erl
@@ -16,7 +16,7 @@ start(_Type, _Args) ->
{"/[:paste_id]", toppage_handler, []}
]}
]),
- {ok, _} = cowboy:start_clear(http, 100, [{port, 8080}], #{
+ {ok, _} = cowboy:start_clear(http, [{port, 8080}], #{
env => #{dispatch => Dispatch}
}),
rest_pastebin_sup:start_link().
diff --git a/examples/ssl_hello_world/src/ssl_hello_world_app.erl b/examples/ssl_hello_world/src/ssl_hello_world_app.erl
index ba42b24..009ab8f 100644
--- a/examples/ssl_hello_world/src/ssl_hello_world_app.erl
+++ b/examples/ssl_hello_world/src/ssl_hello_world_app.erl
@@ -17,7 +17,7 @@ start(_Type, _Args) ->
]}
]),
PrivDir = code:priv_dir(ssl_hello_world),
- {ok, _} = cowboy:start_tls(https, 100, [
+ {ok, _} = cowboy:start_tls(https, [
{port, 8443},
{cacertfile, PrivDir ++ "/ssl/cowboy-ca.crt"},
{certfile, PrivDir ++ "/ssl/server.crt"},
diff --git a/examples/upload/src/upload_app.erl b/examples/upload/src/upload_app.erl
index 468d15d..37929cd 100644
--- a/examples/upload/src/upload_app.erl
+++ b/examples/upload/src/upload_app.erl
@@ -16,7 +16,7 @@ start(_Type, _Args) ->
{"/upload", upload_handler, []}
]}
]),
- {ok, _} = cowboy:start_clear(http, 100, [{port, 8080}], #{
+ {ok, _} = cowboy:start_clear(http, [{port, 8080}], #{
env => #{dispatch => Dispatch}
}),
upload_sup:start_link().
diff --git a/examples/websocket/src/websocket_app.erl b/examples/websocket/src/websocket_app.erl
index f89882f..90e6c8d 100644
--- a/examples/websocket/src/websocket_app.erl
+++ b/examples/websocket/src/websocket_app.erl
@@ -17,7 +17,7 @@ start(_Type, _Args) ->
{"/static/[...]", cowboy_static, {priv_dir, websocket, "static"}}
]}
]),
- {ok, _} = cowboy:start_clear(http, 100, [{port, 8080}], #{
+ {ok, _} = cowboy:start_clear(http, [{port, 8080}], #{
env => #{dispatch => Dispatch}
}),
websocket_sup:start_link().
diff --git a/rebar.config b/rebar.config
index 0dcb524..857060e 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,4 +1,4 @@
{deps, [
-{cowlib,".*",{git,"https://github.com/ninenines/cowlib","master"}},{ranch,".*",{git,"https://github.com/ninenines/ranch","1.3.0"}}
+{cowlib,".*",{git,"https://github.com/ninenines/cowlib","master"}},{ranch,".*",{git,"https://github.com/ninenines/ranch","1.4.0"}}
]}.
{erl_opts, [debug_info,warn_export_vars,warn_shadow_vars,warn_obsolete_guard,warn_export_all,warn_missing_spec,warn_untyped_record]}.
diff --git a/src/cowboy.erl b/src/cowboy.erl
index e4705b6..f01bcf4 100644
--- a/src/cowboy.erl
+++ b/src/cowboy.erl
@@ -14,8 +14,8 @@
-module(cowboy).
--export([start_clear/4]).
--export([start_tls/4]).
+-export([start_clear/3]).
+-export([start_tls/3]).
-export([stop_listener/1]).
-export([set_env/3]).
@@ -37,27 +37,23 @@
-type http_version() :: 'HTTP/2' | 'HTTP/1.1' | 'HTTP/1.0'.
-export_type([http_version/0]).
-%% @todo We should hide NbAcceptors in a socket variable, even if Ranch
-%% doesn't let us do that yet.
--spec start_clear(ranch:ref(), non_neg_integer(), ranch_tcp:opts(), opts())
+-spec start_clear(ranch:ref(), ranch_tcp:opts(), opts())
-> {ok, pid()} | {error, any()}.
-start_clear(Ref, NbAcceptors, TransOpts0, ProtoOpts0)
- when is_integer(NbAcceptors), NbAcceptors > 0 ->
+start_clear(Ref, TransOpts0, ProtoOpts0) ->
{TransOpts, ConnectionType} = ensure_connection_type(TransOpts0),
ProtoOpts = ProtoOpts0#{connection_type => ConnectionType},
- ranch:start_listener(Ref, NbAcceptors, ranch_tcp, TransOpts, cowboy_clear, ProtoOpts).
+ ranch:start_listener(Ref, ranch_tcp, TransOpts, cowboy_clear, ProtoOpts).
--spec start_tls(ranch:ref(), non_neg_integer(), ranch_ssl:opts(), opts())
+-spec start_tls(ranch:ref(), ranch_ssl:opts(), opts())
-> {ok, pid()} | {error, any()}.
-start_tls(Ref, NbAcceptors, TransOpts0, ProtoOpts0)
- when is_integer(NbAcceptors), NbAcceptors > 0 ->
+start_tls(Ref, TransOpts0, ProtoOpts0) ->
{TransOpts1, ConnectionType} = ensure_connection_type(TransOpts0),
TransOpts = [
{next_protocols_advertised, [<<"h2">>, <<"http/1.1">>]},
{alpn_preferred_protocols, [<<"h2">>, <<"http/1.1">>]}
|TransOpts1],
ProtoOpts = ProtoOpts0#{connection_type => ConnectionType},
- ranch:start_listener(Ref, NbAcceptors, ranch_ssl, TransOpts, cowboy_tls, ProtoOpts).
+ ranch:start_listener(Ref, ranch_ssl, TransOpts, cowboy_tls, ProtoOpts).
ensure_connection_type(TransOpts) ->
case proplists:get_value(connection_type, TransOpts) of
diff --git a/test/cowboy_test.erl b/test/cowboy_test.erl
index a219878..bdae7e4 100644
--- a/test/cowboy_test.erl
+++ b/test/cowboy_test.erl
@@ -20,19 +20,19 @@
%% Listeners initialization.
init_http(Ref, ProtoOpts, Config) ->
- {ok, _} = cowboy:start_clear(Ref, 100, [{port, 0}], ProtoOpts),
+ {ok, _} = cowboy:start_clear(Ref, [{port, 0}], ProtoOpts),
Port = ranch:get_port(Ref),
[{type, tcp}, {protocol, http}, {port, Port}, {opts, []}|Config].
init_https(Ref, ProtoOpts, Config) ->
Opts = ct_helper:get_certs_from_ets(),
- {ok, _} = cowboy:start_tls(Ref, 100, Opts ++ [{port, 0}], ProtoOpts),
+ {ok, _} = cowboy:start_tls(Ref, Opts ++ [{port, 0}], ProtoOpts),
Port = ranch:get_port(Ref),
[{type, ssl}, {protocol, http}, {port, Port}, {opts, Opts}|Config].
init_http2(Ref, ProtoOpts, Config) ->
Opts = ct_helper:get_certs_from_ets(),
- {ok, _} = cowboy:start_tls(Ref, 100, Opts ++ [{port, 0}], ProtoOpts),
+ {ok, _} = cowboy:start_tls(Ref, Opts ++ [{port, 0}], ProtoOpts),
Port = ranch:get_port(Ref),
[{type, ssl}, {protocol, http2}, {port, Port}, {opts, Opts}|Config].
diff --git a/test/http2_SUITE.erl b/test/http2_SUITE.erl
index 454c1a4..6eaa11d 100644
--- a/test/http2_SUITE.erl
+++ b/test/http2_SUITE.erl
@@ -49,7 +49,7 @@ inactivity_timeout(Config) ->
env => #{dispatch => cowboy_router:compile(init_routes(Config))},
inactivity_timeout => 1000
},
- {ok, _} = cowboy:start_clear(Ref, 100, [{port, 0}], ProtoOpts),
+ {ok, _} = cowboy:start_clear(Ref, [{port, 0}], ProtoOpts),
Port = ranch:get_port(Ref),
SocketConfig = [{type, tcp}, {protocol, http}, {port, Port}, {opts, []}|Config],
{ok, Socket} = do_handshake(SocketConfig),
diff --git a/test/http_SUITE.erl b/test/http_SUITE.erl
index 1fa583a..e57e384 100644
--- a/test/http_SUITE.erl
+++ b/test/http_SUITE.erl
@@ -88,14 +88,14 @@ init_per_group(Name = https_compress, Config) ->
}, Config);
%% Most, if not all of these, should be in separate test suites.
init_per_group(onresponse, Config) ->
- {ok, _} = cowboy:start_clear(onresponse, 100, [{port, 0}], [
+ {ok, _} = cowboy:start_clear(onresponse, [{port, 0}], [
{env, [{dispatch, init_dispatch(Config)}]},
{onresponse, fun do_onresponse_hook/4}
]),
Port = ranch:get_port(onresponse),
[{type, tcp}, {port, Port}, {opts, []}|Config];
init_per_group(onresponse_capitalize, Config) ->
- {ok, _} = cowboy:start_clear(onresponse_capitalize, 100, [{port, 0}], [
+ {ok, _} = cowboy:start_clear(onresponse_capitalize, [{port, 0}], [
{env, [{dispatch, init_dispatch(Config)}]},
{onresponse, fun do_onresponse_capitalize_hook/4}
]),
@@ -107,13 +107,13 @@ init_per_group(parse_host, Config) ->
{"/req_attr", http_req_attr, []}
]}
]),
- {ok, _} = cowboy:start_clear(parse_host, 100, [{port, 0}], [
+ {ok, _} = cowboy:start_clear(parse_host, [{port, 0}], [
{env, [{dispatch, Dispatch}]}
]),
Port = ranch:get_port(parse_host),
[{type, tcp}, {port, Port}, {opts, []}|Config];
init_per_group(set_env, Config) ->
- {ok, _} = cowboy:start_clear(set_env, 100, [{port, 0}], [
+ {ok, _} = cowboy:start_clear(set_env, [{port, 0}], [
{env, [{dispatch, []}]}
]),
Port = ranch:get_port(set_env),
diff --git a/test/ws_SUITE.erl b/test/ws_SUITE.erl
index b127c7a..ad4e15e 100644
--- a/test/ws_SUITE.erl
+++ b/test/ws_SUITE.erl
@@ -38,7 +38,7 @@ init_per_group(Name = autobahn, Config) ->
"http://autobahn.ws/testsuite/installation.html"),
{skip, "Autobahn Test Suite not installed."};
_ ->
- {ok, _} = cowboy:start_clear(Name, 100, [{port, 33080}], #{
+ {ok, _} = cowboy:start_clear(Name, [{port, 33080}], #{
env => #{dispatch => init_dispatch()}
}),
Config