Ensure that a canonical path is always used for the docBase of a Cont…

…ext to ensure consistent behaviour. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1842702 13f79535-47bb-0310-9956-ffa450edef68
apache · Oct 3, 2018 · d63695a · d63695a
1 parent 3d6d1a1
commit d63695a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java
@@ -579,7 +579,7 @@ protected void fixDocBase() throws IOException {
 
         File file = new File(docBase);
         if (!file.isAbsolute()) {
-            docBase = (new File(appBase, docBase)).getPath();
+            docBase = (new File(appBase, docBase)).getCanonicalPath();
         } else {
             docBase = file.getCanonicalPath();
         }

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -88,6 +88,10 @@
         <code>conf/context.xml</code> and <code>conf/web.xml</code> on a per
         host basis. (fschumacher)
       </fix>
+      <fix>
+        Ensure that a canonical path is always used for the docBase of a Context
+        to ensure consistent behaviour. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">