Author: markt
Date: Fri Sep 2 10:05:04 2011
New Revision: 1164455
URL: http://svn.apache.org/viewvc?rev=1164455&view=rev
Log:
Correct connectionLinger documentation
Modified:
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1164455&r1=1164454&r2=1164455&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Sep 2 10:05:04 2011
@@ -76,6 +76,14 @@
</add>
</changelog>
</subsection>
+ <subsection>
+ <changelog>
+ <fix>
+ Correct the documentation for the connectionLinger atribute of the HTTP
+ connector. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 6.0.33 (jfclere)" rtext="released 2011-08-18">
<subsection name="Catalina">
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml?rev=1164455&r1=1164454&r2=1164455&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml Fri Sep 2 10:05:04 2011
@@ -292,8 +292,10 @@
<attribute name="connectionLinger" required="false">
<p>The number of milliseconds during which the sockets used by this
- <strong>Connector</strong> will linger when they are closed.
- The default value is -1 (socket linger is disabled).</p>
+ <strong>Connector</strong> will linger when they are closed. Setting this
+ attribute to <code>-1</code> will disable connection linger. The default
+ value for the BIO and AJP connectors is 100. The default value for the
NIO
+ connection is 25.</p>
</attribute>
<attribute name="connectionTimeout" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
