You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2006/11/16 13:11:45 UTC
svn commit: r475702 - in /httpd/httpd/branches/2.0.x/docs/manual/mod:
core.html.en core.xml quickreference.html.en
Author: trawick
Date: Thu Nov 16 04:11:44 2006
New Revision: 475702
URL: http://svn.apache.org/viewvc?view=rev&rev=475702
Log:
merge from trunk revision 475698:
TimeOut can be set in a vhost context
Submitted by: Eric Covener
Reviewed by: Jeff Trawick
Modified:
httpd/httpd/branches/2.0.x/docs/manual/mod/core.html.en
httpd/httpd/branches/2.0.x/docs/manual/mod/core.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/quickreference.html.en
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/core.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/docs/manual/mod/core.html.en?view=diff&rev=475702&r1=475701&r2=475702
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/core.html.en Thu Nov 16 04:11:44 2006
@@ -3005,7 +3005,7 @@
certain events before failing a request</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>TimeOut <var>seconds</var></code></td></tr>
<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>TimeOut 300</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</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>
</table>
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/docs/manual/mod/core.xml?view=diff&rev=475702&r1=475701&r2=475702
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/core.xml Thu Nov 16 04:11:44 2006
@@ -2959,7 +2959,7 @@
certain events before failing a request</description>
<syntax>TimeOut <var>seconds</var></syntax>
<default>TimeOut 300</default>
-<contextlist><context>server config</context></contextlist>
+<contextlist><context>server config</context><context>virtual host</context></contextlist>
<usage>
<p>The <directive>TimeOut</directive> directive currently defines
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/quickreference.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/docs/manual/mod/quickreference.html.en?view=diff&rev=475702&r1=475701&r2=475702
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/quickreference.html.en (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/quickreference.html.en Thu Nov 16 04:11:44 2006
@@ -679,7 +679,7 @@
per child process</td></tr>
<tr><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Number of threads created by each child process</td></tr>
<tr class="odd"><td><a href="mpm_netware.html#threadstacksize">ThreadStackSize <var>number</var></a></td><td> 65536 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Determine the stack size for each thread</td></tr>
-<tr><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Amount of time the server will wait for
+<tr><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Amount of time the server will wait for
certain events before failing a request</td></tr>
<tr class="odd"><td><a href="core.html#traceenable">TraceEnable <var>[on|off|extended]</var></a></td><td> on </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Determines the behaviour on <code>TRACE</code>
requests</td></tr>