Author: markt
Date: Tue Mar 24 12:53:32 2009
New Revision: 757767
URL: http://svn.apache.org/viewvc?rev=757767&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39013
When testing for invalid docBase, test for an exact match with the appBase dir
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/HostConfig.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/HostConfig.java?rev=757767&r1=757766&r2=757767&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/HostConfig.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/HostConfig.java
Tue Mar 24 12:53:32 2009
@@ -1020,7 +1020,7 @@
try {
File current = new File(resources[j]);
current = current.getCanonicalFile();
- if
((current.getAbsolutePath().startsWith(appBase().getAbsolutePath()))
+ if
((current.getAbsolutePath().startsWith(appBase().getAbsolutePath() +
File.separator))
||
(current.getAbsolutePath().startsWith(configBase().getAbsolutePath()))) {
if (log.isDebugEnabled())
log.debug("Delete " + current);
@@ -1060,7 +1060,7 @@
try {
File current = new File(resources[j]);
current = current.getCanonicalFile();
- if
((current.getAbsolutePath().startsWith(appBase().getAbsolutePath()))
+ if
((current.getAbsolutePath().startsWith(appBase().getAbsolutePath() +
File.separator))
||
(current.getAbsolutePath().startsWith(configBase().getAbsolutePath()))) {
if (log.isDebugEnabled())
log.debug("Delete " + current);
@@ -1077,7 +1077,7 @@
try {
File current = new File(resources2[j]);
current = current.getCanonicalFile();
- if
((current.getAbsolutePath().startsWith(appBase().getAbsolutePath()))
+ if
((current.getAbsolutePath().startsWith(appBase().getAbsolutePath() +
File.separator))
||
((current.getAbsolutePath().startsWith(configBase().getAbsolutePath())
&&
(current.getAbsolutePath().endsWith(".xml"))))) {
if (log.isDebugEnabled())
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=757767&r1=757766&r2=757767&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Mar 24 12:53:32 2009
@@ -35,6 +35,10 @@
<subsection name="Catalina">
<changelog>
<fix>
+ <bug>39013</bug>: When testing for an invalid docBase, use an exact
+ match for the appBase. (markt)
+ </fix>
+ <fix>
Remove wrong "No role found" realm debug log message,
even if a role was found. (rjung)
</fix>
@@ -42,6 +46,10 @@
<bug>41407</bug>: JAAS Realm now works with CLIENT-CERT authentication.
(markt)
</fix>
+ <add>
+ <bug>42419</bug>: Add a system property that enables the name of the
+ session cookie and session path parameter to be configured. (markt)
+ </add>
<fix>
<bug>45576</bug>: JAAS Realm now works with DIGEST authentication.
(markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
