Author: markt
Date: Wed Mar 16 09:30:10 2011
New Revision: 1082104
URL: http://svn.apache.org/viewvc?rev=1082104&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50927
Better error message if SSLCertificateFile not set
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
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=1082104&r1=1082103&r2=1082104&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed Mar 16
09:30:10 2011
@@ -463,6 +463,11 @@ public class AprEndpoint extends Abstrac
// Initialize SSL if needed
if (isSSLEnabled()) {
+ if (SSLCertificateFile == null) {
+ // This is required
+ throw new
Exception(sm.getString("endpoint.apr.noSslCertFile"));
+ }
+
// SSL protocol
int value = SSL.SSL_PROTOCOL_ALL;
if ("SSLv2".equalsIgnoreCase(SSLProtocol)) {
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties?rev=1082104&r1=1082103&r2=1082104&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
Wed Mar 16 09:30:10 2011
@@ -45,3 +45,4 @@ endpoint.warn.noInsecureReneg=Secure ren
endpoint.warn.unlockAcceptorFailed=Acceptor thread [{0}] failed to unlock.
Forcing hard socket shutdown.
endpoint.debug.channelCloseFail=Failed to close channel
endpoint.debug.socketCloseFail=Failed to close socket
+endpoint.apr.noSslCertFile=Connector attribute SSLCertificateFile must be
defined when using SSL with APR
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1082104&r1=1082103&r2=1082104&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Mar 16 09:30:10 2011
@@ -92,6 +92,11 @@
completion. (markt)
</fix>
<fix>
+ <bug>50927</bug>: Improve error message when SSLCertificateFile is not
+ specified when using APR with SSL. Based on a patch provided by sebb.
+ (markt)
+ </fix>
+ <fix>
<bug>50928</bug>: Don't ignore keyPass attribute for HTTP BIO and
NIO connectors. Based on a patch provided by sebb. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
