svn commit: r1733954 - /httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml

[co...@apache.org]

Author: covener
Date: Mon Mar  7 18:24:21 2016
New Revision: 1733954

URL: http://svn.apache.org/viewvc?rev=1733954&view=rev
Log:
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.



Modified:
    httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml?rev=1733954&r1=1733953&r2=1733954&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml Mon Mar  7 18:24:21 2016
@@ -4307,10 +4307,14 @@ certain events before failing a request<
     <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<
       <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>