Author: csutherl
Date: Tue Jan 23 13:15:09 2018
New Revision: 1822001
URL: http://svn.apache.org/viewvc?rev=1822001&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62023
Log error reporting multiple SSLHostConfig elements when using the APR
Connector instead of crashing Tomcat.
Modified:
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/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1822001&r1=1822000&r2=1822001&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 23
13:15:09 2018
@@ -625,12 +625,12 @@ public class AprEndpoint extends Abstrac
@Override
protected void releaseSSLContext(SSLHostConfig sslHostConfig) {
Long ctx = sslHostConfig.getOpenSslContext();
- if (ctx != null) {
+ if (ctx != null && ctx != 0) {
SSLContext.free(ctx.longValue());
sslHostConfig.setOpenSslContext(null);
}
Long cctx = sslHostConfig.getOpenSslConfContext();
- if (cctx != null) {
+ if (cctx != null && cctx != 0) {
SSLConf.free(cctx.longValue());
sslHostConfig.setOpenSslConfContext(null);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1822001&r1=1822000&r2=1822001&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jan 23 13:15:09 2018
@@ -53,6 +53,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ <bug>62023</bug>: Log error reporting multiple SSLHostConfig elements
+ when using the APR Connector instead of crashing Tomcat. (csutherl)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.4 (markt)" rtext="2018-01-22">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
