Author: markt
Date: Thu May 15 12:46:54 2008
New Revision: 656810
URL: http://svn.apache.org/viewvc?rev=656810&view=rev
Log:
Support keystoreTypes that don't need a file
Based on a patch by Bruno Harbulot
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=656810&r1=656809&r2=656810&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 15 12:46:54 2008
@@ -51,13 +51,6 @@
+1: jfclere, rjung, fhanik, remm, pero
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43094
- Support keystoreTypes that don't need a file
- Based on a patch by Bruno Harbulot
- http://svn.apache.org/viewvc?rev=653128&view=rev
- +1: markt, remm, billbarker
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43079
and https://issues.apache.org/bugzilla/show_bug.cgi?id=43080
http://svn.apache.org/viewvc?rev=653195&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=656810&r1=656809&r2=656810&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Thu May 15 12:46:54 2008
@@ -310,7 +310,7 @@
InputStream istream = null;
try {
ks = KeyStore.getInstance(type);
- if(! "PKCS11".equalsIgnoreCase(type) ) {
+ if(!("PKCS11".equalsIgnoreCase(type) ||
"".equalsIgnoreCase(path))) {
File keyStoreFile = new File(path);
if (!keyStoreFile.isAbsolute()) {
keyStoreFile = new
File(System.getProperty("catalina.base"),
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=656810&r1=656809&r2=656810&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May 15 12:46:54 2008
@@ -162,6 +162,10 @@
Fix possible ArrayIndexOutOfBoundsException. Patch provided by Charles
R
Caldarale. (markt/jim)
</fix>
+ <update>
+ Add support for keystore types that do not need a file. Based on a
patch by
+ Bruno Harbulot. (markt)
+ </update>
<fix>
<bug>43191</bug>: Make it possible to override the defaults with the
compressableMimeType attribute. Based on a patch by Len Popp. (markt)
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml?rev=656810&r1=656809&r2=656810&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml Thu May 15 12:46:54 2008
@@ -655,7 +655,9 @@
<p>The pathname of the keystore file where you have stored the
server certificate to be loaded. By default, the pathname is
the file "<code>.keystore</code>" in the operating system home
- directory of the user that is running Tomcat.</p>
+ directory of the user that is running Tomcat. If your
+ <code>keystoreType</code> doesn't need a file use <code>""</code>
+ (empty string) for this parameter.</p>
</attribute>
<attribute name="keystorePass" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
