You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/11/20 16:38:09 UTC

[tomcat] branch master updated: Correct the docs for maxConnections

This is an automated email from the ASF dual-hosted git repository.

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


View the commit online:
https://github.com/apache/tomcat/commit/33e01c97e24e2ccbe1392a2294e77619d8983fdd

The following commit(s) were added to refs/heads/master by this push:
     new 33e01c9  Correct the docs for maxConnections
33e01c9 is described below

commit 33e01c97e24e2ccbe1392a2294e77619d8983fdd
Author: Mark Thomas <ma...@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 0dab42e..08ec5a0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -64,6 +64,11 @@
         CSRF nonce request parameter name to be customized.
         (schultz)
       </add>
+      <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 45f4d03..137c6e7 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -379,11 +379,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 6419370..0747de7 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -451,11 +451,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


Re: [tomcat] branch master updated: Correct the docs for maxConnections

Posted by Rémy Maucherat <re...@apache.org>.
On Wed, Nov 20, 2019 at 5:38 PM <ma...@apache.org> wrote:

> This is an automated email from the ASF dual-hosted git repository.
>
> markt pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> View the commit online:
>
> https://github.com/apache/tomcat/commit/33e01c97e24e2ccbe1392a2294e77619d8983fdd
>
> The following commit(s) were added to refs/heads/master by this push:
>      new 33e01c9  Correct the docs for maxConnections
> 33e01c9 is described below
>
> commit 33e01c97e24e2ccbe1392a2294e77619d8983fdd
> Author: Mark Thomas <ma...@apache.org>
> AuthorDate: Wed Nov 20 16:33:54 2019 +0000
>
>     Correct the docs for maxConnections
>

Although the feature now actually works for NIO2 (it took a while ...), its
default used to be -1 and it didn't cause problems. The default is now 10k
for NIOx and 8*1024 for APR.

I think it would be nice to change this to either:
- Default to 8*1024 for all connectors, as it would remove one line of code
and a convoluted comment in APR
- Default NIOx to -1

Rémy