Author: markt
Date: Thu Apr 24 13:36:38 2014
New Revision: 1589726
URL: http://svn.apache.org/r1589726
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56416
Document correct default for socket linger.
Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/ajp.xml
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1589726&r1=1589725&r2=1589726&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Apr 24 13:36:38 2014
@@ -163,6 +163,10 @@
<bug>56348</bug>: Fix slow asynchronous read when read was performed on
a non-container thread. (markt)
</fix>
+ <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">
Modified: tomcat/trunk/webapps/docs/config/ajp.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=1589726&r1=1589725&r2=1589726&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/trunk/webapps/docs/config/ajp.xml Thu Apr 24 13:36:38 2014
@@ -322,8 +322,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/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1589726&r1=1589725&r2=1589726&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Thu Apr 24 13:36:38 2014
@@ -344,8 +344,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]
