Author: remm
Date: Fri Nov 16 14:36:16 2018
New Revision: 1846716
URL: http://svn.apache.org/viewvc?rev=1846716&view=rev
Log:
Add more special SSL attributes for storeconfig.
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml?rev=1846716&r1=1846715&r2=1846716&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml Fri
Nov 16 14:36:16 2018
@@ -102,7 +102,7 @@
<TransientAttribute>URIEncoding</TransientAttribute>
<TransientAttribute>maxProcessor</TransientAttribute>
<TransientAttribute>minProcessor</TransientAttribute>
- <!-- All attribute duplicated from the SSLHostConfig, may be removed
in Tomcat 10 -->
+ <!-- All attribute duplicated from the SSLHostConfig, removed in
Tomcat 10 -->
<TransientAttribute>SSLProtocol</TransientAttribute>
<TransientAttribute>sslEnabledProtocols</TransientAttribute>
<TransientAttribute>SSLCipherSuite</TransientAttribute>
@@ -138,6 +138,13 @@
<TransientAttribute>truststorePass</TransientAttribute>
<TransientAttribute>truststoreProvider</TransientAttribute>
<TransientAttribute>truststoreType</TransientAttribute>
+ <!-- All attribute duplicated from the AbstractHttp11Protocol, removed
in Tomcat 10 -->
+ <TransientAttribute>clientAuth</TransientAttribute>
+ <TransientAttribute>SSLVerifyClient</TransientAttribute>
+ <TransientAttribute>trustMaxCertLength</TransientAttribute>
+ <TransientAttribute>SSLVerifyDepth</TransientAttribute>
+ <TransientAttribute>useServerCipherSuitesOrder</TransientAttribute>
+ <TransientAttribute>SSLHonorCipherOrder</TransientAttribute>
</Description>
<Description
tag="UpgradeProtocol"
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1846716&r1=1846715&r2=1846716&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Fri
Nov 16 14:36:16 2018
@@ -647,7 +647,7 @@ public abstract class AbstractHttp11Prot
public String getClientAuth() {
registerDefaultSSLHostConfig();
- return defaultSSLHostConfig.getCertificateVerification().toString();
+ return defaultSSLHostConfig.getCertificateVerificationAsString();
}
public void setClientAuth(String certificateVerification) {
registerDefaultSSLHostConfig();
@@ -657,7 +657,7 @@ public abstract class AbstractHttp11Prot
public String getSSLVerifyClient() {
registerDefaultSSLHostConfig();
- return defaultSSLHostConfig.getCertificateVerification().toString();
+ return defaultSSLHostConfig.getCertificateVerificationAsString();
}
public void setSSLVerifyClient(String certificateVerification) {
registerDefaultSSLHostConfig();
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1846716&r1=1846715&r2=1846716&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Fri Nov 16
14:36:16 2018
@@ -338,6 +338,16 @@ public class SSLHostConfig implements Se
}
+ public void setCertificateVerificationAsString(String
certificateVerification) {
+ setCertificateVerification(certificateVerification);
+ }
+
+
+ public String getCertificateVerificationAsString() {
+ return certificateVerification.toString();
+ }
+
+
public void setCertificateVerificationDepth(int
certificateVerificationDepth) {
this.certificateVerificationDepth = certificateVerificationDepth;
certificateVerificationDepthConfigured = true;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1846716&r1=1846715&r2=1846716&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 16 14:36:16 2018
@@ -96,6 +96,9 @@
depends on the use of an API that has been deprecated in later versions
of Java. (markt)
</add>
+ <fix>
+ Fix more storeconfig issues with duplicated SSL attributes. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
