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 2022/11/18 15:50:46 UTC
[tomcat] branch 9.0.x updated: Improve the docs for bindOnInit
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 2908b4931a Improve the docs for bindOnInit
2908b4931a is described below
commit 2908b4931a9b1e545dde169eddefd3f04800896b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Nov 18 15:49:55 2022 +0000
Improve the docs for bindOnInit
---
java/org/apache/coyote/http11/Http11Processor.java | 12 ++++++------
webapps/docs/config/ajp.xml | 9 +++++----
webapps/docs/config/http.xml | 9 +++++----
webapps/docs/config/service.xml | 6 +++---
4 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java
index 3ed86daeb2..83fbbf4e7c 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -282,11 +282,11 @@ public class Http11Processor extends AbstractProcessor {
// parse headers.
prepareRequestProtocol();
- if (protocol.isPaused()) {
- // 503 - Service unavailable
- response.setStatus(503);
- setErrorState(ErrorState.CLOSE_CLEAN, null);
- } else {
+ //if (protocol.isPaused()) {
+ // // 503 - Service unavailable
+ // response.setStatus(503);
+ // setErrorState(ErrorState.CLOSE_CLEAN, null);
+ //} else {
keptAlive = true;
// Set this every time in case limit has been changed via JMX
request.getMimeHeaders().setLimit(protocol.getMaxHeaderCount());
@@ -301,7 +301,7 @@ public class Http11Processor extends AbstractProcessor {
if (!protocol.getDisableUploadTimeout()) {
socketWrapper.setReadTimeout(protocol.getConnectionUploadTimeout());
}
- }
+ //}
} catch (IOException e) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("http11processor.header.parse"), e);
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index 505ee56b50..82df320332 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -380,10 +380,11 @@
</attribute>
<attribute name="bindOnInit" required="false">
- <p>Controls when the socket used by the connector is bound. By default it
- is bound when the connector is initiated and unbound when the connector is
- destroyed. If set to <code>false</code>, the socket will be bound when the
- connector is started and unbound when it is stopped.</p>
+ <p>Controls when the socket used by the connector is bound. If set to
+ <code>true</code> it is bound when the connector is initiated and unbound
+ when the connector is destroyed. If set to <code>false</code>, the socket
+ will be bound when the connector is started and unbound when it is
+ stopped. If not specified, the default is <code>true</code>.</p>
</attribute>
<attribute name="clientCertProvider" required="false">
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 019e859796..f9b8468f69 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -353,10 +353,11 @@
</attribute>
<attribute name="bindOnInit" required="false">
- <p>Controls when the socket used by the connector is bound. By default it
- is bound when the connector is initiated and unbound when the connector is
- destroyed. If set to <code>false</code>, the socket will be bound when the
- connector is started and unbound when it is stopped.</p>
+ <p>Controls when the socket used by the connector is bound. If set to
+ <code>true</code> it is bound when the connector is initiated and unbound
+ when the connector is destroyed. If set to <code>false</code>, the socket
+ will be bound when the connector is started and unbound when it is
+ stopped. If not specified, the default is <code>true</code>.</p>
</attribute>
<attribute name="clientCertProvider" required="false">
diff --git a/webapps/docs/config/service.xml b/webapps/docs/config/service.xml
index 5fd0acda8c..bcca17f1a8 100644
--- a/webapps/docs/config/service.xml
+++ b/webapps/docs/config/service.xml
@@ -85,9 +85,9 @@
<p>The time to wait, in milliseconds, when stopping the Service for the
client connections to finish processing and close before the Service's
container hierarchy is stopped. The wait only applies to Connectors
- configured with a <code>bindOnInit</code> value of <code>false</code>.
- Any value of zero or less means there will be no wait. If not specified,
- the default value of zero will be used.</p>
+ configured with a <code>bindOnInit</code> value of <code>false</code>
+ which is not the default. Any value of zero or less means there will be no
+ wait. If not specified, the default value of zero will be used.</p>
</attribute>
</attributes>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org