Author: markt
Date: Thu Jun 4 12:48:13 2009
New Revision: 781723
URL: http://svn.apache.org/viewvc?rev=781723&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38570
When checking docBase against appBase, make sure we check for an exact match
against the appBase
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java?rev=781723&r1=781722&r2=781723&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
Thu Jun 4 12:48:13 2009
@@ -889,7 +889,7 @@
}
}
- if (docBase.startsWith(canonicalAppBase.getPath())) {
+ if (docBase.startsWith(canonicalAppBase.getPath() +
File.separatorChar)) {
docBase = docBase.substring(canonicalAppBase.getPath().length());
docBase = docBase.replace(File.separatorChar, '/');
if (docBase.startsWith("/")) {
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=781723&r1=781722&r2=781723&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Jun 4 12:48:13 2009
@@ -55,6 +55,10 @@
have a certificate. Return a 401 rather than a 400 in this case.
(markt)
</fix>
<fix>
+ <bug>38570</bug>: When checking docBase against appBase, make sure we
+ check for an exact match against the appBase. (markt)
+ </fix>
+ <fix>
<bug>39013</bug>: When testing for an invalid docBase, use an exact
match for the appBase. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
