From: Joe Orton <jorton@apache.org>
Date: Wed, 24 Jun 2009 09:46:30 +0000 (+0000)
Subject: Merge r641855 from trunk:
X-Git-Tag: 2.2.12~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27b8586e33489e2e236f982e8bd4a55a26fed00f;p=thirdparty%2Fapache%2Fhttpd.git

Merge r641855 from trunk:

Update Timeout section, the semantics changed completely
since 1.3 and the caveats on signals not being reset
thankfully no longer apply either.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@787961 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 563c622594f..a8758625cc4 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -3163,26 +3163,29 @@ certain events before failing a request</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>
-    <p>The <code class="directive">TimeOut</code> directive currently defines
-    the amount of time Apache will wait for three things:</p>
+    <p>The <code class="directive">TimeOut</code> directive defines the length
+    of time Apache will wait for I/O in various circumstances:</p>
 
     <ol>
-      <li>The total amount of time it takes to receive a GET
-      request.</li>
+      <li>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>
 
-      <li>The amount of time between receipt of TCP packets on a
-      POST or PUT request.</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
+      full.</li>
 
-      <li>The amount of time between ACKs on transmissions of TCP
-      packets in responses.</li>
+      <li>In <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, the length of time to wait for
+      output from a CGI script.</li>
+
+      <li>In <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code>, the length of time to
+      wait for output from a filtering process.</li>
+
+      <li>In <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code>, the default timeout value if
+      <code class="directive"><a href="../mod/mod_proxy.html#proxytimeout">ProxyTimeout</a></code> is not
+      configured.</li>
     </ol>
 
-    <p>We plan on making these separately configurable at some point
-    down the road. The timer used to default to 1200 before 1.2,
-    but has been lowered to 300 which is still far more than
-    necessary in most situations. It is not set any lower by
-    default because there may still be odd places in the code where
-    the timer is not reset when a packet is sent. </p>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 2910cf85c80..d0a91a8451e 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -3137,26 +3137,29 @@ certain events before failing a request</description>
 <contextlist><context>server config</context><context>virtual host</context></contextlist>
 
 <usage>
-    <p>The <directive>TimeOut</directive> directive currently defines
-    the amount of time Apache will wait for three things:</p>
+    <p>The <directive>TimeOut</directive> directive defines the length
+    of time Apache will wait for I/O in various circumstances:</p>
 
     <ol>
-      <li>The total amount of time it takes to receive a GET
-      request.</li>
+      <li>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>
 
-      <li>The amount of time between receipt of TCP packets on a
-      POST or PUT request.</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
+      full.</li>
 
-      <li>The amount of time between ACKs on transmissions of TCP
-      packets in responses.</li>
+      <li>In <module>mod_cgi</module>, the length of time to wait for
+      output from a CGI script.</li>
+
+      <li>In <module>mod_ext_filter</module>, the length of time to
+      wait for output from a filtering process.</li>
+
+      <li>In <module>mod_proxy</module>, the default timeout value if
+      <directive module="mod_proxy">ProxyTimeout</directive> is not
+      configured.</li>
     </ol>
 
-    <p>We plan on making these separately configurable at some point
-    down the road. The timer used to default to 1200 before 1.2,
-    but has been lowered to 300 which is still far more than
-    necessary in most situations. It is not set any lower by
-    default because there may still be odd places in the code where
-    the timer is not reset when a packet is sent. </p>
 </usage>
 </directivesynopsis>