Commit 6e625c05 authored by Eric Covener's avatar Eric Covener
Browse files

Merge r1733952, r1733953 from trunk: 

Note that Timeout on a new connection can be "hidden" by an
AcceptFilter.




Timeout scenarios are more of an unordered list.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1733954 13f79535-47bb-0310-9956-ffa450edef68
parent ba1bd498

docs/manual/mod/core.xml

+8 −4
Original line number Diff line number Diff line
@@ -4307,10 +4307,14 @@ certain events before failing a request</description> 
    <p>The <directive>TimeOut</directive> directive defines the length

    of time Apache httpd will wait for I/O in various circumstances:</p>



    <ol>

      <li>When reading data from the client, the length of time to

    <ul>

      <li><p>When reading data from the client, the length of time to

      wait for a TCP packet to arrive if the read buffer is

      empty.</li>

      empty.</p>

      <p> For initial data on a new connection, this directive doesn't

      take effect until after any configured <directive module="core">

      AcceptFilter</directive> has passed the new connection to the server.</p>

      </li>



      <li>When writing data to the client, the length of time to wait

      for an acknowledgement of a packet if the send buffer is
@@ -4325,7 +4329,7 @@ certain events before failing a request</description> 
      <li>In <module>mod_proxy</module>, the default timeout value if

      <directive module="mod_proxy">ProxyTimeout</directive> is not

      configured.</li>

    </ol>

    </ul>



</usage>

</directivesynopsis>