Author: markt
Date: Thu Oct 2 18:46:24 2014
New Revision: 1629038
URL: http://svn.apache.org/r1629038
Log:
Use the whole relative docBase when constructing the absolute form.
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1629038&r1=1629037&r2=1629038&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java Thu
Oct 2 18:46:24 2014
@@ -655,7 +655,7 @@ public class StandardRoot extends Lifecy
File f = new File(docBase);
if (!f.isAbsolute()) {
- f = new File(((Host)context.getParent()).getAppBaseFile(),
f.getName());
+ f = new File(((Host)context.getParent()).getAppBaseFile(),
f.getPath());
}
if (f.isDirectory()) {
main = new DirResourceSet(this, "/", f.getAbsolutePath(), "/");
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1629038&r1=1629037&r2=1629038&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 2 18:46:24 2014
@@ -104,6 +104,10 @@
Correct a couple of NPEs in the JNDI Realm that could be triggered with
when not specifying a roleBase and enabling roleSearchAsUser. (markt)
</fix>
+ <fix>
+ Correctly handle relative values for the docBase attribute of a
Context.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
