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
The following commit(s) were added to refs/heads/8.5.x by this push:
new 3b74a8877c Align with 9.0.x
3b74a8877c is described below
commit 3b74a8877c54c1516513f746286e6e0ebdf55287
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Mar 6 21:07:24 2023 +0000
Align with 9.0.x
---
java/org/apache/coyote/ajp/AjpProcessor.java | 34 +++++++++++-----------
.../coyote/ajp/TestAbstractAjpProcessor.java | 2 +-
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java
b/java/org/apache/coyote/ajp/AjpProcessor.java
index b1e5ca93bc..103f90f700 100644
--- a/java/org/apache/coyote/ajp/AjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpProcessor.java
@@ -127,24 +127,24 @@ public class AjpProcessor extends AbstractProcessor {
System.arraycopy(pongMessage.getBuffer(), 0, pongMessageArray, 0,
pongMessage.getLen());
// Build the Set of javax attributes
+ Set<String> s2 = new HashSet<>();
+ s2.add("javax.servlet.request.cipher_suite");
+ s2.add("javax.servlet.request.key_size");
+ s2.add("javax.servlet.request.ssl_session");
+ s2.add("javax.servlet.request.X509Certificate");
+ javaxAttributes = Collections.unmodifiableSet(s2);
+
Set<String> s = new HashSet<>();
- s.add("javax.servlet.request.cipher_suite");
- s.add("javax.servlet.request.key_size");
- s.add("javax.servlet.request.ssl_session");
- s.add("javax.servlet.request.X509Certificate");
- javaxAttributes = Collections.unmodifiableSet(s);
-
- Set<String> iis = new HashSet<>();
- iis.add("CERT_ISSUER");
- iis.add("CERT_SUBJECT");
- iis.add("CERT_COOKIE");
- iis.add("HTTPS_SERVER_SUBJECT");
- iis.add("CERT_FLAGS");
- iis.add("HTTPS_SECRETKEYSIZE");
- iis.add("CERT_SERIALNUMBER");
- iis.add("HTTPS_SERVER_ISSUER");
- iis.add("HTTPS_KEYSIZE");
- iisTlsAttributes = Collections.unmodifiableSet(iis);
+ s.add("CERT_ISSUER");
+ s.add("CERT_SUBJECT");
+ s.add("CERT_COOKIE");
+ s.add("HTTPS_SERVER_SUBJECT");
+ s.add("CERT_FLAGS");
+ s.add("HTTPS_SECRETKEYSIZE");
+ s.add("CERT_SERIALNUMBER");
+ s.add("HTTPS_SERVER_ISSUER");
+ s.add("HTTPS_KEYSIZE");
+ iisTlsAttributes = Collections.unmodifiableSet(s);
}
diff --git a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
index b3fccd1b3e..0ab9f77618 100644
--- a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
+++ b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
@@ -505,7 +505,7 @@ public class TestAbstractAjpProcessor extends
TomcatBaseTest {
@Test
public void testSecret() throws Exception {
Tomcat tomcat = getTomcatInstance();
- Assert.assertTrue(tomcat.getConnector().setProperty("requiredSecret",
"RIGHTSECRET"));
+ Assert.assertTrue(tomcat.getConnector().setProperty("secret",
"RIGHTSECRET"));
tomcat.start();
// No file system docBase required
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
