Author: markt
Date: Thu Apr 21 13:52:39 2011
New Revision: 1095711
URL: http://svn.apache.org/viewvc?rev=1095711&view=rev
Log:
Move the maxConnections description to the correct part of the HTTP doc. Add it
to the AJP doc.
Modified:
tomcat/trunk/webapps/docs/config/ajp.xml
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/webapps/docs/config/ajp.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=1095711&r1=1095710&r2=1095711&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/trunk/webapps/docs/config/ajp.xml Thu Apr 21 13:52:39 2011
@@ -379,10 +379,18 @@
<subsection name="BIO specific configuration">
- <p>The BIO implementation supports the following Java TCP socket attributes
- in addition to the common Connector and AJP attributes listed above.</p>
+ <p>The BIO implementation supports the following attributes in addition to
+ the common Connector and AJP attributes listed above.</p>
<attributes>
+ <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
+ is <code>10000</code>.</p>
+ </attribute>
<attribute name="socket.rxBufSize" required="false">
<p>(int)The socket receive buffer (SO_RCVBUF) size in bytes. JVM
default
used if not set.</p>
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1095711&r1=1095710&r2=1095711&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Thu Apr 21 13:52:39 2011
@@ -373,15 +373,6 @@
execute tasks using the executor rather than an internal thread pool.</p>
</attribute>
- <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 reach below this value. The
operating system may still accept connections based
- on the <code>acceptCount</code> setting.
- This setting is currently only applicable to the blocking Java
connectors (AJP/HTTP).
- Default value is <code>10000</code>.</p>
- </attribute>
-
<attribute name="maxTrailerSize" required="false">
<p>Limits the total length of trailing headers in the last chunk of
a chunked HTTP request. If the value is <code>-1</code>, no limit will be
@@ -554,8 +545,21 @@
<subsection name="BIO specific configuration">
- <p>There are no BIO specific configuration settings.</p>
+ <p>The following attributes are specific to the BIO connector.</p>
+ <attributes>
+
+ <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
+ is <code>10000</code>.</p>
+ </attribute>
+
+ </attributes>
+
</subsection>
<subsection name="NIO specific configuration">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
