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
The following commit(s) were added to refs/heads/master by this push:
new d4b0576 Improve docs for maxConnections and acceptCount
d4b0576 is described below
commit d4b05768796b29fc25bf853b44fcf36bb04e114c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 20 11:28:45 2021 +0100
Improve docs for maxConnections and acceptCount
---
webapps/docs/changelog.xml | 9 +++++++++
webapps/docs/config/ajp.xml | 8 +++++---
webapps/docs/config/http.xml | 31 ++++++++++++++++++-------------
3 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d127949..c7e7cc9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -152,6 +152,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Web applications">
+ <changelog>
+ <fix>
+ Improve the description of the <code>maxConnections</code> and
+ <code>acceptCount</code> attributes in the Connector section of the
+ documentation web application. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 10.0.6 (markt)" rtext="2021-05-12">
<subsection name="Catalina">
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index 2d9aec8..1b678cd 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -295,9 +295,11 @@
<attributes>
<attribute name="acceptCount" required="false">
- <p>The maximum queue length for incoming connection requests when
- all possible request processing threads are in use. Any requests
- received when the queue is full will be refused. The default
+ <p>The maximum length of the operating system provided queue for incoming
+ connection requests when <code>maxConnections</code> has been reached.
The
+ operating system may ignore this setting and use a different size for the
+ queue. When this queue is full, the operating system may actively refuse
+ additional connections or those connections may time out. The default
value is 100.</p>
</attribute>
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 93af99b..b51a0d0 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -54,16 +54,19 @@
<code>mod_jk 1.2.x</code> connector for Apache 1.3), please refer to the
<a href="ajp.html">AJP Connector</a> documentation.</p>
- <p>Each incoming request requires
- a thread for the duration of that request. If more simultaneous requests
- are received than can be handled by the currently available request
- processing threads, additional threads will be created up to the
- configured maximum (the value of the <code>maxThreads</code> attribute).
- If still more simultaneous requests are received, they are stacked up
- inside the server socket created by the <strong>Connector</strong>, up to
- the configured maximum (the value of the <code>acceptCount</code>
- attribute). Any further simultaneous requests will receive "connection
- refused" errors, until resources are available to process them.</p>
+ <p>Each incoming, non-asynchronous request requires a thread for the duration
+ of that request. If more simultaneous requests are received than can be
+ handled by the currently available request processing threads, additional
+ threads will be created up to the configured maximum (the value of the
+ <code>maxThreads</code> attribute). If still more simultaneous requests are
+ received, Tomcat will accept new connections until the current number of
+ connections reaches <code>maxConnections</code>. Connections are queued
inside
+ the server socket created by the <strong>Connector</strong> until a thread
+ becomes avaialble to process the connection. Once <code>maxConnections</code>
+ has been reached the operating system will queue further connections. The
size
+ of the operating system provided connection queue may be controlled by the
+ <code>acceptCount</code> attribute. If the operating system queue fills,
+ further connection requests may be refused or may time out.</p>
</section>
@@ -331,9 +334,11 @@
<attributes>
<attribute name="acceptCount" required="false">
- <p>The maximum queue length for incoming connection requests when
- all possible request processing threads are in use. Any requests
- received when the queue is full will be refused. The default
+ <p>The maximum length of the operating system provided queue for incoming
+ connection requests when <code>maxConnections</code> has been reached.
The
+ operating system may ignore this setting and use a different size for the
+ queue. When this queue is full, the operating system may actively refuse
+ additional connections or those connections may time out. The default
value is 100.</p>
</attribute>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
