Author: markt
Date: Tue Aug 22 20:38:04 2017
New Revision: 1805826
URL: http://svn.apache.org/viewvc?rev=1805826&view=rev
Log:
Delay checking that the configured attributes for an SSLHostConfig instance are
consistent with the configured SSL implementation until Connector start to
avoid incorrect warnings when the SSL implementation changes during
initialisation.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1805826&r1=1805825&r2=1805826&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Tue Aug
22 20:38:04 2017
@@ -187,8 +187,8 @@ public abstract class AbstractEndpoint<S
if (key == null || key.length() == 0) {
throw new
IllegalArgumentException(sm.getString("endpoint.noSslHostName"));
}
- sslHostConfig.setConfigType(getSslConfigType());
if (bindState != BindState.UNBOUND && isSSLEnabled()) {
+ sslHostConfig.setConfigType(getSslConfigType());
try {
createSSLContext(sslHostConfig);
} catch (Exception e) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1805826&r1=1805825&r2=1805826&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Tue
Aug 22 20:38:04 2017
@@ -81,6 +81,7 @@ public abstract class AbstractJsseEndpoi
sslImplementation =
SSLImplementation.getInstance(getSslImplementationName());
for (SSLHostConfig sslHostConfig : sslHostConfigs.values()) {
+ sslHostConfig.setConfigType(getSslConfigType());
createSSLContext(sslHostConfig);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1805826&r1=1805825&r2=1805826&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue Aug 22
20:38:04 2017
@@ -372,6 +372,7 @@ public class AprEndpoint extends Abstrac
// Initialize SSL if needed
if (isSSLEnabled()) {
for (SSLHostConfig sslHostConfig : sslHostConfigs.values()) {
+ sslHostConfig.setConfigType(getSslConfigType());
createSSLContext(sslHostConfig);
}
SSLHostConfig defaultSSLHostConfig =
sslHostConfigs.get(getDefaultSSLHostConfigName());
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1805826&r1=1805825&r2=1805826&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Aug 22 20:38:04 2017
@@ -130,6 +130,13 @@
<bug>61415</bug>: Fix TLS renegotiation with OpenSSL based connections
and session caching. (markt)
</fix>
+ <fix>
+ Delay checking that the configured attributes for an
+ <code>SSLHostConfig</code> instance are consistent with the configured
+ SSL implementation until <code>Connector</code> start to avoid
incorrect
+ warnings when the SSL implementation changes during initialisation.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Tribes">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
