Author: markt
Date: Fri Dec 27 09:35:41 2013
New Revision: 1553651
URL: http://svn.apache.org/r1553651
Log:
Be more precise about how maxConnections works
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:r1553650
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=1553651&r1=1553650&r2=1553651&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Dec 27 09:35:41 2013
@@ -80,7 +80,12 @@
</fix>
<fix>
Clarify that the connectionTimeout may also be used as the read timeout
- when reading a request body (if any). (markt)
+ when reading a request body (if any) in the documentation web
+ application. (markt)
+ </fix>
+ <fix>
+ Clarify the behaviour of the maxConnections attribute for a connector
in
+ the documentation web application. (markt)
</fix>
</changelog>
</subsection>
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=1553651&r1=1553650&r2=1553651&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml Fri Dec 27 09:35:41 2013
@@ -355,10 +355,13 @@
<attribute name="maxConnections" required="false">
<p>The maximum number of connections that the server will accept and
process at any given time. When this number has been reached, the server
- will not accept any more connections until the number of connections
- falls below this value. The operating system may still accept
- connections based on the <code>acceptCount</code> setting. Default value
- varies by connector type. For BIO the default is the value of
+ will accept, but not process, one further connection. This additional
+ connection be blocked until the number of connections being processed
+ falls below <strong>maxConnections</strong> at which point the server
will
+ start accepting and processing new connections again. Note that once the
+ limit has been reached, the operating system may still accept connections
+ based on the <code>acceptCount</code> setting. The default value varies
by
+ connector type. For BIO the default is the value of
<strong>maxThreads</strong> unless an <a
href="executor.html">Executor</a>
is used in which case the default will be the value of maxThreads from
the
executor. For NIO the default is <code>10000</code>.
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=1553651&r1=1553650&r2=1553651&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 09:35:41 2013
@@ -393,10 +393,13 @@
<attribute name="maxConnections" required="false">
<p>The maximum number of connections that the server will accept and
process at any given time. When this number has been reached, the server
- will not accept any more connections until the number of connections
- falls below this value. The operating system may still accept
- connections based on the <code>acceptCount</code> setting. Default value
- varies by connector type. For BIO the default is the value of
+ will accept, but not process, one further connection. This additional
+ connection be blocked until the number of connections being processed
+ falls below <strong>maxConnections</strong> at which point the server
will
+ start accepting and processing new connections again. Note that once the
+ limit has been reached, the operating system may still accept connections
+ based on the <code>acceptCount</code> setting. The default value varies
by
+ connector type. For BIO the default is the value of
<strong>maxThreads</strong> unless an <a
href="executor.html">Executor</a>
is used in which case the default will be the value of maxThreads from
the
executor. For NIO the default is <code>10000</code>.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
