aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]enines.eu>2020-05-20 11:08:58 +0200
committerLoïc Hoguin <[email protected]>2020-05-20 11:08:58 +0200
commit8337aca4d31ffa8120704057675aacbbaa280975 (patch)
tree84905c9c574a5974ab66e42b1269a9e5aa0d7bf9
parent4edc39b0030ad09098283cf9aac8182a1d5cba26 (diff)
downloadcowboy-8337aca4d31ffa8120704057675aacbbaa280975.tar.gz
cowboy-8337aca4d31ffa8120704057675aacbbaa280975.tar.bz2
cowboy-8337aca4d31ffa8120704057675aacbbaa280975.zip
Increase the default max_keepalive HTTP option to 1000
100 is very low for current deployments. 1000 is more appropriate as a default value.
-rw-r--r--doc/src/manual/cowboy_http.asciidoc2
-rw-r--r--src/cowboy_http.erl2
-rw-r--r--test/rfc7230_SUITE.erl3
3 files changed, 4 insertions, 3 deletions
diff --git a/doc/src/manual/cowboy_http.asciidoc b/doc/src/manual/cowboy_http.asciidoc
index b088797..33d2888 100644
--- a/doc/src/manual/cowboy_http.asciidoc
+++ b/doc/src/manual/cowboy_http.asciidoc
@@ -121,7 +121,7 @@ max_headers (100)::
Maximum number of headers allowed per request.
-max_keepalive (100)::
+max_keepalive (1000)::
Maximum number of requests allowed per connection.
diff --git a/src/cowboy_http.erl b/src/cowboy_http.erl
index e7a28da..2833e79 100644
--- a/src/cowboy_http.erl
+++ b/src/cowboy_http.erl
@@ -176,7 +176,7 @@ init(Parent, Ref, Socket, Transport, ProxyHeader, Opts) ->
parent=Parent, ref=Ref, socket=Socket,
transport=Transport, proxy_header=ProxyHeader, opts=Opts,
peer=Peer, sock=Sock, cert=Cert,
- last_streamid=maps:get(max_keepalive, Opts, 100)},
+ last_streamid=maps:get(max_keepalive, Opts, 1000)},
setopts_active(State),
loop(set_timeout(State, request_timeout));
{{error, Reason}, _, _} ->
diff --git a/test/rfc7230_SUITE.erl b/test/rfc7230_SUITE.erl
index 19b97bc..e110441 100644
--- a/test/rfc7230_SUITE.erl
+++ b/test/rfc7230_SUITE.erl
@@ -33,7 +33,8 @@ groups() -> [{http, [parallel], ct_helper:all(?MODULE)}].
init_per_group(Name = http, Config) ->
cowboy_test:init_http(Name = http, #{
- env => #{dispatch => cowboy_router:compile(init_routes(Config))}
+ env => #{dispatch => cowboy_router:compile(init_routes(Config))},
+ max_keepalive => 100
}, Config).
end_per_group(Name, _) ->