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 2020/02/05 14:50:42 UTC
[tomcat] branch 8.5.x updated (e303c8e -> 03c4361)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from e303c8e Fix typo. Update for change to attribute name.
new 2f7745c Fix trailing ws
new 6193d3b Update MBean descriptors for JMX changes
new 03c4361 Refactor secret check
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
conf/server.xml | 2 +-
java/org/apache/catalina/connector/mbeans-descriptors.xml | 10 +++++++++-
java/org/apache/coyote/ajp/AbstractAjpProtocol.java | 4 ++--
3 files changed, 12 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/03: Fix trailing ws
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 2f7745c817b8861d1a0cd1de80fd81aa40b006be
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 5 14:33:07 2020 +0000
Fix trailing ws
---
conf/server.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/server.xml b/conf/server.xml
index bd3ed3e..91bd415 100644
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -116,7 +116,7 @@
<!--
<Connector protocol="AJP/1.3"
address="::1"
- port="8009"
+ port="8009"
redirectPort="8443" />
-->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/03: Update MBean descriptors for JMX changes
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6193d3b03f91ff004a008693ed6041401b7c9d09
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 5 14:46:45 2020 +0000
Update MBean descriptors for JMX changes
---
java/org/apache/catalina/connector/mbeans-descriptors.xml | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/connector/mbeans-descriptors.xml b/java/org/apache/catalina/connector/mbeans-descriptors.xml
index efc26c7..976144c 100644
--- a/java/org/apache/catalina/connector/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/connector/mbeans-descriptors.xml
@@ -44,6 +44,10 @@
description="Send AJP flush package for each explicit flush"
type="boolean"/>
+ <attribute name="allowedRequestAttributesPattern"
+ description="Regular expression that any custom request attributes muct match else the request will be rejected"
+ type="java.lang.String"/>
+
<attribute name="allowTrace"
description="Allow disabling TRACE method"
type="boolean"/>
@@ -164,10 +168,14 @@
type="java.lang.String"/>
<attribute name="secret"
- description="Authentication secret (I guess ... not in Javadocs)"
+ description="Authentication secret"
readable = "false"
type="java.lang.String"/>
+ <attribute name="secretRequired"
+ description="Must secret be set to a non-null, non-zero-length String?"
+ type="boolean"/>
+
<attribute name="secure"
description="Is this a secure (SSL) Connector?"
type="boolean"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/03: Refactor secret check
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 03c436126db6794db5277a3b3d871016fb9a3f23
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 5 14:47:48 2020 +0000
Refactor secret check
Moving the check to start allows invalid configurations to be fixed via
JMX and changes to be made followed by stop()/start() for those changes
to take effect.
---
java/org/apache/coyote/ajp/AbstractAjpProtocol.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
index 6790713..641ec18 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -267,13 +267,13 @@ public abstract class AbstractAjpProtocol<S> extends AbstractProtocol<S> {
@Override
- public void init() throws Exception {
+ public void start() throws Exception {
if (getSecretRequired()) {
String secret = getSecret();
if (secret == null || secret.length() == 0) {
throw new IllegalArgumentException(sm.getString("ajpprotocol.nosecret"));
}
}
- super.init();
+ super.start();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org