Author: yoavs
Date: Sun Dec 24 18:41:35 2006
New Revision: 490099
URL: http://svn.apache.org/viewvc?view=rev&rev=490099
Log:
Bugzilla 38774: use javax.net.ssl.keyStorePassword system property as backup.
Modified:
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml
Modified:
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?view=diff&rev=490099&r1=490098&r2=490099
==============================================================================
---
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Sun Dec 24 18:41:35 2006
@@ -205,7 +205,11 @@
}
String keystorePass = (String)attributes.get("keystorePass");
if (keystorePass == null) {
- keystorePass = keyPass;
+ // Bugzilla 38774:
http://issues.apache.org/bugzilla/show_bug.cgi?id=38774
+ keystorePass =
System.getProperty("javax.net.ssl.keyStorePassword");
+ if (keystorePass == null ) {
+ keystorePass = keyPass;
+ }
}
return keystorePass;
}
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=490099&r1=490098&r2=490099
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Dec 24 18:41:35 2006
@@ -180,6 +180,10 @@
<bug>41057</bug>: Modify StringCache to add a configurable upper bound
to the length of cached strings. (remm/markt)
</fix>
+ <fix>
+ <bug>38774</bug>: Check javax.net.ssl.keyStorePassword system property
as a secondary
+ source for keystore password in JSSESocketFactory, as suggested by Ted
X. Toth. (yoavs)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
Modified: tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml?view=diff&rev=490099&r1=490098&r2=490099
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml Sun Dec 24 18:41:35
2006
@@ -8,7 +8,7 @@
<properties>
<author email="[EMAIL PROTECTED]">Remy Maucherat</author>
- <author email="[EMAIL PROTECTED]">Yoav Shapira</author>
+ <author>Yoav Shapira</author>
<author email="[EMAIL PROTECTED]">Andrew R. Jaquith</author>
<title>The AJP Connector</title>
</properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
