From: Eric Covener Date: Mon, 7 Mar 2016 18:24:21 +0000 (+0000) Subject: Merge r1733952, r1733953 from trunk: X-Git-Tag: 2.4.19~95 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=732cff9f58b7ccbe323acf1f828c17965c46b638;p=apache 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 --- diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index c4dda62f4d..51daffec0b 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -4307,10 +4307,14 @@ certain events before failing a request

The TimeOut directive defines the length of time Apache httpd will wait for I/O in various circumstances:

-
    -
  1. When reading data from the client, the length of time to +
      +
    • When reading data from the client, the length of time to wait for a TCP packet to arrive if the read buffer is - empty.

    • + empty.

      +

      For initial data on a new connection, this directive doesn't + take effect until after any configured + AcceptFilter has passed the new connection to the server.

      +
    • 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
    • In mod_proxy, the default timeout value if ProxyTimeout is not configured.
    • -
+