diff options
| author | Jeff Trawick <trawick@apache.org> | 2006-11-16 12:11:44 +0000 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2006-11-16 12:11:44 +0000 |
| commit | 56ceceb8eff07e95f3f783b1ae40bd2e95fac4d3 (patch) | |
| tree | d55ad497eeb1c4b7c732cb9f26417afb9b166443 | |
| parent | 3536455ed0b1d5a7b04fd1ffeb1531c251d5345d (diff) | |
| download | httpd-56ceceb8eff07e95f3f783b1ae40bd2e95fac4d3.tar.gz | |
merge from trunk revision 475698:
TimeOut can be set in a vhost context
Submitted by: Eric Covener
Reviewed by: Jeff Trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@475702 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | docs/manual/mod/core.html.en | 2 | ||||
| -rw-r--r-- | docs/manual/mod/core.xml | 2 | ||||
| -rw-r--r-- | docs/manual/mod/quickreference.html.en | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 8d68f34f1a..8d7650ae93 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -3005,7 +3005,7 @@ server</td></tr> 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> diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index e016323cd0..e15aac60d8 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -2959,7 +2959,7 @@ server</description> 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 diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index 14821006e1..3fb24dfacc 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -679,7 +679,7 @@ Certificate verification</td></tr> 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> |