From: Rich Bowen Date: Wed, 13 Apr 2005 01:21:11 +0000 (+0000) Subject: As discussed on the list, change the default setting for X-Git-Tag: 2.1.5~188 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6efa7782137ea7f5263cac646a4b1d074c7844bd;p=apache As discussed on the list, change the default setting for KeepAliveTimeout from 15 seconds to 5 seconds. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161140 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/conf/extra/httpd-default.conf.in b/docs/conf/extra/httpd-default.conf.in index 30ce7b8ff4..efeca0520f 100644 --- a/docs/conf/extra/httpd-default.conf.in +++ b/docs/conf/extra/httpd-default.conf.in @@ -26,7 +26,7 @@ MaxKeepAliveRequests 100 # KeepAliveTimeout: Number of seconds to wait for the next request from the # same client on the same connection. # -KeepAliveTimeout 15 +KeepAliveTimeout 5 # # UseCanonicalName: Determines how Apache constructs self-referencing diff --git a/docs/manual/misc/perf-tuning.html.en b/docs/manual/misc/perf-tuning.html.en index f551a586f8..d31b0e9ee5 100644 --- a/docs/manual/misc/perf-tuning.html.en +++ b/docs/manual/misc/perf-tuning.html.en @@ -382,7 +382,7 @@

When keep-alives are in use, children will be kept busy doing nothing waiting for more requests on the already open - connection. The default KeepAliveTimeout of 15 + connection. The default KeepAliveTimeout of 5 seconds attempts to minimize this effect. The tradeoff here is between network bandwidth and server resources. In no event should you raise this above about 60 seconds, as diff --git a/docs/manual/misc/perf-tuning.xml b/docs/manual/misc/perf-tuning.xml index e05e3beb78..db16fcca24 100644 --- a/docs/manual/misc/perf-tuning.xml +++ b/docs/manual/misc/perf-tuning.xml @@ -409,7 +409,7 @@

When keep-alives are in use, children will be kept busy doing nothing waiting for more requests on the already open connection. The default KeepAliveTimeout of 15 + >KeepAliveTimeout of 5 seconds attempts to minimize this effect. The tradeoff here is between network bandwidth and server resources. In no event should you raise this above about 60 seconds, as Description:Amount of time the server will wait for subsequent requests on a persistent connection Syntax:KeepAliveTimeout seconds -Default:KeepAliveTimeout 15 +Default:KeepAliveTimeout 5 Context:server config, virtual host Status:Core Module:core diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index ad8e8b78f6..b38a20949e 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -1453,7 +1453,7 @@ the server configuration files Amount of time the server will wait for subsequent requests on a persistent connection KeepAliveTimeout seconds -KeepAliveTimeout 15 +KeepAliveTimeout 5 server configvirtual host diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index 988bf8ca0c..4b3142a032 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -365,7 +365,7 @@ extensions ISAPIReadAheadBuffer size 49152 svdhBSize of the Read Ahead Buffer sent to ISAPI extensions KeepAlive On|Off On svCEnables HTTP persistent connections -KeepAliveTimeout seconds 15 svCAmount of time the server will wait for subsequent +KeepAliveTimeout seconds 5 svCAmount of time the server will wait for subsequent requests on a persistent connection LanguagePriority MIME-lang [MIME-lang] ...svdhBThe precendence of language variants for cases where diff --git a/include/httpd.h b/include/httpd.h index f0b81276c0..761a612b6a 100644 --- a/include/httpd.h +++ b/include/httpd.h @@ -149,7 +149,7 @@ extern "C" { /* The timeout for waiting for keepalive timeout until next request */ #ifndef DEFAULT_KEEPALIVE_TIMEOUT -#define DEFAULT_KEEPALIVE_TIMEOUT 15 +#define DEFAULT_KEEPALIVE_TIMEOUT 5 #endif /* The number of requests to entertain per connection */