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:41 UTC
[tomcat] branch main updated: Improve the docs for bindOnInit
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new c955e1238a Improve the docs for bindOnInit
c955e1238a is described below
commit c955e1238a75d4d17d9fb70750c375bbb69fa7fa
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 c27ff911f4..b5f1153520 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -283,11 +283,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());
@@ -302,7 +302,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 c8b20ab573..0a3a260bf3 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -386,10 +386,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 306b5e084e..40afbfb8fd 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -351,10 +351,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