Author: markt
Date: Thu Apr 24 13:38:08 2014
New Revision: 1589728
URL: http://svn.apache.org/r1589728
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56416
Document correct default for socket linger.
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/ajp.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1589726
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=1589728&r1=1589727&r2=1589728&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Apr 24 13:38:08 2014
@@ -113,6 +113,14 @@
</add>
</changelog>
</subsection>
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ <bug>56416</bug>: Correct documentation for default value of socket
+ linger for the AJP and HTTP connectors. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Jasper">
<changelog>
<fix>
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=1589728&r1=1589727&r2=1589728&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml Thu Apr 24 13:38:08 2014
@@ -317,8 +317,8 @@
<attribute name="connectionLinger" required="false">
<p>The number of seconds during which the sockets used by this
- <strong>Connector</strong> will linger when they are closed.
- If not specified, the JVM default will be used.</p>
+ <strong>Connector</strong> will linger when they are closed. The default
+ value is <code>-1</code> which disables socket linger.</p>
</attribute>
<attribute name="connectionTimeout" required="false">
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=1589728&r1=1589727&r2=1589728&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Thu Apr 24 13:38:08 2014
@@ -337,8 +337,8 @@
<attribute name="connectionLinger" required="false">
<p>The number of seconds during which the sockets used by this
- <strong>Connector</strong> will linger when they are closed.
- If not specified, the JVM default will be used.</p>
+ <strong>Connector</strong> will linger when they are closed. The default
+ value is <code>-1</code> which disables socket linger.</p>
</attribute>
<attribute name="connectionTimeout" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
