Commit 32fb8420 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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.2.x@475699 13f79535-47bb-0310-9956-ffa450edef68
parent f9fe4c6c

docs/manual/mod/core.xml

+1 −1
Changes for docs/manual/mod/core.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -3069,7 +3069,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