Author: markt
Date: Fri May 20 18:11:53 2011
New Revision: 1125492
URL: http://svn.apache.org/viewvc?rev=1125492&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=35054
Check that a file is not specified for a Host's appBase and log an error if it
is.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1125492&r1=1125491&r2=1125492&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Fri May 20
18:11:53 2011
@@ -1312,7 +1312,7 @@ public class HostConfig
if (host.getCreateDirs()) {
File[] dirs = new File[] {appBase(),configBase()};
for (int i=0; i<dirs.length; i++) {
- if ( (!dirs[i].exists()) && (!dirs[i].mkdirs())) {
+ if ( (!dirs[i].isDirectory()) && (!dirs[i].mkdirs())) {
log.error(sm.getString("hostConfig.createDirs",dirs[i]));
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1125492&r1=1125491&r2=1125492&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri May 20 18:11:53 2011
@@ -46,6 +46,10 @@
<subsection name="Catalina">
<changelog>
<fix>
+ <bug>35054</bug>: Check that a file is not specified for a Host's
+ appBase and log an error if it is. (markt)
+ </fix>
+ <fix>
<bug>51197</bug>: Fix possible dropped connection when sendError or
sendRedirst are used during async processing. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
