tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject [tomcat] branch 8.5.x updated: Correct the docs for maxConnections
Date Wed, 20 Nov 2019 16:41:13 GMT
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


View the commit online:
https://github.com/apache/tomcat/commit/402acdb5c3099f78cca2d035ff80d69cdd5d5ab9

The following commit(s) were added to refs/heads/8.5.x by this push:
     new 402acdb  Correct the docs for maxConnections
402acdb is described below

commit 402acdb5c3099f78cca2d035ff80d69cdd5d5ab9
Author: Mark Thomas <markt@apache.org>
AuthorDate: Wed Nov 20 16:33:54 2019 +0000

    Correct the docs for maxConnections
---
 webapps/docs/changelog.xml   | 5 +++++
 webapps/docs/config/ajp.xml  | 7 ++-----
 webapps/docs/config/http.xml | 7 ++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f00d418..0a1daa6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -60,6 +60,11 @@
         Fix the broken re-try link on the error page for the FORM authentication
         example in the JSP section of the examples web application. (markt)
       </fix>
+      <fix>
+        Correct the documentation for the <code>maxConnections</code> attribute
+        of the <code>Connector</code> in the documentation web application.
+        (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index bc63c89..f16c443 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -387,11 +387,8 @@
       based on the <code>acceptCount</code> setting. The default value varies
by
       connector type. For NIO and NIO2 the default is <code>10000</code>.
       For APR/native, the default is <code>8192</code>.</p>
-      <p>Note that for APR/native on Windows, the configured value will be
-      reduced to the highest multiple of 1024 that is less than or equal to
-      maxConnections. This is done for performance reasons.<br/>
-      If set to a value of -1, the maxConnections feature is disabled
-      and connections are not counted.</p>
+      <p>For NIO/NIO2 only, setting the value to -1, will disable the
+      maxConnections feature and connections will not be counted.</p>
     </attribute>
 
     <attribute name="maxCookieCount" required="false">
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 5766d26..a89f3fe 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -467,11 +467,8 @@
       based on the <code>acceptCount</code> setting. The default value varies
by
       connector type. For NIO and NIO2 the default is <code>10000</code>.
       For APR/native, the default is <code>8192</code>.</p>
-      <p>Note that for APR/native on Windows, the configured value will be
-      reduced to the highest multiple of 1024 that is less than or equal to
-      maxConnections. This is done for performance reasons.<br/>
-      If set to a value of -1, the maxConnections feature is disabled
-      and connections are not counted.</p>
+      <p>For NIO/NIO2 only, setting the value to -1, will disable the
+      maxConnections feature and connections will not be counted.</p>
     </attribute>
 
     <attribute name="maxCookieCount" required="false">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message