From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 6 Sep 2011 14:14:27 +0000 (+0000)
Subject: Clarify the default connectionTimeout.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=c4fd77a854ee7df577a4865d0bf34de12ee2e93d;p=tomcat7.0

Clarify the default connectionTimeout.
Add info on setting infinite timeouts.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1165677 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index b64a99ab9..80ae2b1c5 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -317,7 +317,10 @@
     <attribute name="connectionTimeout" required="false">
       <p>The number of milliseconds this <strong>Connector</strong> will wait,
       after accepting a connection, for the request URI line to be
-      presented.  The default value is 60000 (i.e. 60 seconds).</p>
+      presented. Use a value of -1 to indicate no (i.e. infinite) timeout.
+      The default value is 60000 (i.e. 60 seconds) but note that the standard
+      server.xml that ships with Tomcat sets this to 20000 (i.e. 20 seconds).
+      </p>
     </attribute>
     
     <attribute name="connectionUploadTimeout" required="false">
@@ -347,7 +350,8 @@
       <p>The number of milliseconds this <strong>Connector</strong> will wait
       for another HTTP request before closing the connection. The default value
       is to use the value that has been set for the
-      <strong>connectionTimeout</strong> attribute.</p>
+      <strong>connectionTimeout</strong> attribute.
+      Use a value of -1 to indicate no (i.e. infinite) timeout.</p>
     </attribute>
 
     <attribute name="maxConnections" required="false">