You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@apache.org on 2005/04/13 03:21:13 UTC
svn commit: r161140 - in httpd/httpd/trunk:
docs/conf/extra/httpd-default.conf.in docs/manual/misc/perf-tuning.html.en
docs/manual/misc/perf-tuning.xml docs/manual/mod/core.html.en
docs/manual/mod/core.xml docs/manual/mod/quickreference.html.en
include/httpd.h
Author: rbowen
Date: Tue Apr 12 18:21:11 2005
New Revision: 161140
URL: http://svn.apache.org/viewcvs?view=rev&rev=161140
Log:
As discussed on the list, change the default setting for
KeepAliveTimeout from 15 seconds to 5 seconds.
Modified:
httpd/httpd/trunk/docs/conf/extra/httpd-default.conf.in
httpd/httpd/trunk/docs/manual/misc/perf-tuning.html.en
httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml
httpd/httpd/trunk/docs/manual/mod/core.html.en
httpd/httpd/trunk/docs/manual/mod/core.xml
httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
httpd/httpd/trunk/include/httpd.h
Modified: httpd/httpd/trunk/docs/conf/extra/httpd-default.conf.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/conf/extra/httpd-default.conf.in?view=diff&r1=161139&r2=161140
==============================================================================
--- httpd/httpd/trunk/docs/conf/extra/httpd-default.conf.in (original)
+++ httpd/httpd/trunk/docs/conf/extra/httpd-default.conf.in Tue Apr 12 18:21:11 2005
@@ -26,7 +26,7 @@
# 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
Modified: httpd/httpd/trunk/docs/manual/misc/perf-tuning.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/misc/perf-tuning.html.en?view=diff&r1=161139&r2=161140
==============================================================================
--- httpd/httpd/trunk/docs/manual/misc/perf-tuning.html.en (original)
+++ httpd/httpd/trunk/docs/manual/misc/perf-tuning.html.en Tue Apr 12 18:21:11 2005
@@ -382,7 +382,7 @@
<p>When keep-alives are in use, children will be kept busy
doing nothing waiting for more requests on the already open
- connection. The default <code class="directive"><a href="../mod/core.html#keepalivetimeout">KeepAliveTimeout</a></code> of <code>15</code>
+ connection. The default <code class="directive"><a href="../mod/core.html#keepalivetimeout">KeepAliveTimeout</a></code> of <code>5</code>
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 <code>60</code> seconds, as <a href="http://www.research.digital.com/wrl/techreports/abstracts/95.4.html">
Modified: httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml?view=diff&r1=161139&r2=161140
==============================================================================
--- httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml (original)
+++ httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml Tue Apr 12 18:21:11 2005
@@ -409,7 +409,7 @@
<p>When keep-alives are in use, children will be kept busy
doing nothing waiting for more requests on the already open
connection. The default <directive module="core"
- >KeepAliveTimeout</directive> of <code>15</code>
+ >KeepAliveTimeout</directive> of <code>5</code>
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 <code>60</code> seconds, as <a
Modified: httpd/httpd/trunk/docs/manual/mod/core.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/core.html.en?view=diff&r1=161139&r2=161140
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.html.en Tue Apr 12 18:21:11 2005
@@ -1491,7 +1491,7 @@
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Amount of time the server will wait for subsequent
requests on a persistent connection</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>KeepAliveTimeout <var>seconds</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>KeepAliveTimeout 15</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>KeepAliveTimeout 5</code></td></tr>
<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/core.xml?view=diff&r1=161139&r2=161140
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml Tue Apr 12 18:21:11 2005
@@ -1453,7 +1453,7 @@
<description>Amount of time the server will wait for subsequent
requests on a persistent connection</description>
<syntax>KeepAliveTimeout <var>seconds</var></syntax>
-<default>KeepAliveTimeout 15</default>
+<default>KeepAliveTimeout 5</default>
<contextlist><context>server config</context><context>virtual host</context>
</contextlist>
Modified: httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/quickreference.html.en?view=diff&r1=161139&r2=161140
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/quickreference.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/quickreference.html.en Tue Apr 12 18:21:11 2005
@@ -365,7 +365,7 @@
<tr class="odd"><td><a href="mod_isapi.html#isapireadaheadbuffer">ISAPIReadAheadBuffer <var>size</var></a></td><td> 49152 </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Size of the Read Ahead Buffer sent to ISAPI
extensions</td></tr>
<tr><td><a href="core.html#keepalive" id="K" name="K">KeepAlive On|Off</a></td><td> On </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Enables HTTP persistent connections</td></tr>
-<tr class="odd"><td><a href="core.html#keepalivetimeout">KeepAliveTimeout <var>seconds</var></a></td><td> 15 </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Amount of time the server will wait for subsequent
+<tr class="odd"><td><a href="core.html#keepalivetimeout">KeepAliveTimeout <var>seconds</var></a></td><td> 5 </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Amount of time the server will wait for subsequent
requests on a persistent connection</td></tr>
<tr><td><a href="mod_negotiation.html#languagepriority" id="L" name="L">LanguagePriority <var>MIME-lang</var> [<var>MIME-lang</var>]
...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">The precendence of language variants for cases where
Modified: httpd/httpd/trunk/include/httpd.h
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/include/httpd.h?view=diff&r1=161139&r2=161140
==============================================================================
--- httpd/httpd/trunk/include/httpd.h (original)
+++ httpd/httpd/trunk/include/httpd.h Tue Apr 12 18:21:11 2005
@@ -149,7 +149,7 @@
/* 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 */