Author: markt Date: Fri Dec 27 00:20:01 2013 New Revision: 1553609 URL: http://svn.apache.org/r1553609 Log: Clarify based on feedback on users@ list
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1553608 Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1553609&r1=1553608&r2=1553609&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Dec 27 00:20:01 2013 @@ -78,6 +78,10 @@ Add index.xhtml to the welcome files list for the examples web application. (kkolinko) </fix> + <fix> + Clarify that the connectionTimeout may also be used as the read timeout + when reading a request body (if any). (markt) + </fix> </changelog> </subsection> </section> Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1553609&r1=1553608&r2=1553609&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Fri Dec 27 00:20:01 2013 @@ -347,7 +347,8 @@ 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> + Unless <strong>disableUploadTimeout</strong> is set to <code>false</code>, + this timeout will also be used when reading the request body (if any).</p> </attribute> <attribute name="connectionUploadTimeout" required="false"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org