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:08 UTC

[tomcat] branch 9.0.x updated (4f471ad -> 49ad3f9)

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


    from 4f471ad  Fix typo. Update for change to attribute name.
     new e143b2f  Fix trailing ws
     new ab9bc7e  Update MBean descriptors for JMX changes
     new 49ad3f9  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] 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 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit ab9bc7e6de72abe98505d8ca205e2a661c37780b
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 8464034..20c068e 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"/>
@@ -180,10 +184,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 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 49ad3f954f69c6e838c8cd112ad79aa5fa8e7153
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 63ff6c5..7cfdf0a 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -257,13 +257,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


[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 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit e143b2fd29687aa2d167230414a97c68cf6c963b
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