Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 71916 invoked from network); 30 Jul 2008 20:28:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Jul 2008 20:28:41 -0000 Received: (qmail 36656 invoked by uid 500); 30 Jul 2008 20:28:37 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 36597 invoked by uid 500); 30 Jul 2008 20:28:37 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 36586 invoked by uid 500); 30 Jul 2008 20:28:37 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 36583 invoked by uid 99); 30 Jul 2008 20:28:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Jul 2008 13:28:37 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Jul 2008 20:27:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4BF23238899C; Wed, 30 Jul 2008 13:28:17 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r681195 - in /tomcat: container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt Date: Wed, 30 Jul 2008 20:28:16 -0000 To: tomcat-dev@jakarta.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080730202817.4BF23238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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) + 43117: Setting an empty workDIR could delete all of + CATALINA_HOME. Patch provided by Takayuki Kaneko. (markt) + + 44529: No roles specified (deny all) should take precedence over no auth-constraint specified (allow-all). (markt) 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: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org