Author: markt
Date: Tue Jan 31 21:43:14 2017
New Revision: 1781174
URL: http://svn.apache.org/viewvc?rev=1781174&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59807
Provide a better error message when there is no SSLHostConfig defined with a
hostName that matches the defaultSSLHostConfigName for the associated Connector.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
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=1781174&r1=1781173&r2=1781174&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Tue
Jan 31 21:43:14 2017
@@ -84,6 +84,13 @@ public abstract class AbstractJsseEndpoi
for (SSLHostConfig sslHostConfig : sslHostConfigs.values()) {
createSSLContext(sslHostConfig);
}
+
+ // Validate default SSLHostConfigName
+ if (sslHostConfigs.get(getDefaultSSLHostConfigName()) == null) {
+ throw new
IllegalArgumentException(sm.getString("endpoint.noSslHostConfig",
+ getDefaultSSLHostConfigName(), getName()));
+ }
+
}
}
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=1781174&r1=1781173&r2=1781174&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue Jan 31
21:43:14 2017
@@ -373,6 +373,10 @@ public class AprEndpoint extends Abstrac
createSSLContext(sslHostConfig);
}
SSLHostConfig defaultSSLHostConfig =
sslHostConfigs.get(getDefaultSSLHostConfigName());
+ if (defaultSSLHostConfig == null) {
+ throw new
IllegalArgumentException(sm.getString("endpoint.noSslHostConfig",
+ getDefaultSSLHostConfigName(), getName()));
+ }
Long defaultSSLContext = defaultSSLHostConfig.getOpenSslContext();
sslContext = defaultSSLContext.longValue();
SSLContext.registerDefault(defaultSSLContext, this);
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1781174&r1=1781173&r2=1781174&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Tue
Jan 31 21:43:14 2017
@@ -48,6 +48,7 @@ endpoint.init.bind=Socket bind failed: [
endpoint.init.listen=Socket listen failed: [{0}] {1}
endpoint.init.notavail=APR not available
endpoint.launch.fail=Failed to launch new runnable
+endpoint.noSslHostConfig=No SSLHostConfig element was found with the hostName
[{0}] to match the defaultSSLHostConfigName for the connector [{1}]
endpoint.noSslHostName=No host name was provided for the SSL host configuration
endpoint.poll.limitedpollsize=Failed to create poller with specified size of
{0}
endpoint.poll.initfail=Poller creation failed
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1781174&r1=1781173&r2=1781174&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jan 31 21:43:14 2017
@@ -87,6 +87,12 @@
Restore Java 9 direct byte buffer compatibility. (remm)
</fix>
<fix>
+ <bug>59807</bug>: Provide a better error message when there is no
+ <strong>SSLHostConfig</strong> defined with a <code>hostName</code>
that
+ matches the <code>defaultSSLHostConfigName</code> for the associated
+ <strong>Connector</strong>. (markt)
+ </fix>
+ <fix>
<bug>60627</bug>: Modify the <code>Rfc6265CookieProcessor</code> so
that
in addition to cookie headers that start with an explicit RFC 2109
<code>$Version=1</code>, cookies that start with
<code>$Version=0</code>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
