Author: markt
Date: Wed Jul 30 13:28:16 2008
New Revision: 681195
URL: http://svn.apache.org/viewvc?rev=681195&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/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java?rev=681195&r1=681194&r2=681195&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
Wed Jul 30 13:28:16 2008
@@ -4751,7 +4751,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/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=681195&r1=681194&r2=681195&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul 30 13:28:16 2008
@@ -54,6 +54,10 @@
context.xml files. (markt)
</fix>
<fix>
+ <bug>43117</bug>: Setting an empty workDIR could delete all of
+ CATALINA_HOME. Patch provided by Takayuki Kaneko. (markt)
+ </fix>
+ <fix>
<bug>44529</bug>: No roles specified (deny all) should take precedence
over no auth-constraint specified (allow-all). (markt)
</fix>
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681195&r1=681194&r2=681195&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 13:28:16 2008
@@ -86,13 +86,6 @@
+1: markt, yoavs
-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, fhanik, yoavs
- -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
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
