Author: kkolinko
Date: Sat May 12 15:36:33 2012
New Revision: 1337573
URL: http://svn.apache.org/viewvc?rev=1337573&view=rev
Log:
Merged revision 1337572 from tomcat/trunk:
https://issues.apache.org/bugzilla/show_bug.cgi?id=53203
Correct documentation of default value of connectionTimeout for AJP protocol.
See org.apache.coyote.ajp.Constants.DEFAULT_CONNECTION_TIMEOUT
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1337572
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml?rev=1337573&r1=1337572&r2=1337573&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml Sat May 12 15:36:33 2012
@@ -319,7 +319,8 @@
<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. The default value for AJP protocol connectors
+ is <code>-1</code> (i.e. infinite).</p>
</attribute>
<attribute name="executor" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
