This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
View the commit online: https://github.com/apache/tomcat/commit/39ddf279a104bcd012d997ffa041318fe4fa9959 The following commit(s) were added to refs/heads/7.0.x by this push: new 39ddf27 Correct the docs for maxConnections 39ddf27 is described below commit 39ddf279a104bcd012d997ffa041318fe4fa9959 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 75ef806..695e3ae 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -155,6 +155,11 @@ Correct the description of the default value for the server attribute in the security How-To. (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> <subsection name="Other"> diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml index 8d6a01b..af7413b 100644 --- a/webapps/docs/config/ajp.xml +++ b/webapps/docs/config/ajp.xml @@ -381,11 +381,8 @@ is used in which case the default will be the value of maxThreads from the executor. For NIO 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 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 880a255..4327bd3 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -432,11 +432,8 @@ is used in which case the default will be the value of maxThreads from the executor. For NIO 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 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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
