Author: markt
Date: Thu May 15 12:39:50 2008
New Revision: 656807
URL: http://svn.apache.org/viewvc?rev=656807&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43117
Setting an empty workDir can delete all of CATALINA_HOME
Patch provided by Takayuki Kaneko.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=656807&r1=656806&r2=656807&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 15 12:39:50 2008
@@ -51,13 +51,6 @@
+1: jfclere, rjung, fhanik, remm, pero
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43117
- Setting an empty workDir can delete all of CATALINA_HOME
- Patch provided by Takayuki Kaneko.
- http://svn.apache.org/viewvc?rev=653113&view=rev
- +1: markt, remm, billbarker
- -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
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=656807&r1=656806&r2=656807&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Thu
May 15 12:39:50 2008
@@ -4990,7 +4990,7 @@
// Acquire (or calculate) the work directory path
String workDir = getWorkDir();
- if (workDir == null) {
+ if (workDir == null || workDir.length() == 0) {
// Retrieve our parent (normally a host) name
String hostName = null;
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=656807&r1=656806&r2=656807&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:39:50 2008
@@ -47,6 +47,14 @@
using the webapp class loader when we create them. (markt)
</fix>
<fix>
+ <bug>43117</bug>: Setting an empty workDir could result in all of
+ CATALINA_HOME being deleted. Patch provided by Takayuki Kaneko. (markt)
+ </fix>
+ <fix>
+ <bug>43142</bug>: Don't assume a directory named xxx.war is a war file.
+ (markt)
+ </fix>
+ <fix>
<bug>43150</bug>: Allow Tomcat to start correctly when installed on a
path that contains a # character. (markt)
</fix>
@@ -55,10 +63,6 @@
middle of persisting. Based on a suggestion by Wade Chandler. (markt)
</fix>
<fix>
- <bug>43142</bug>: Don't assume a directory named xxx.war is a war file.
- (markt)
- </fix>
- <fix>
<bug>43425</bug>: Make annotations spec compliant. Patch provided by
Dain Sundstrom. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
