Correct regression in r1809146 that caused problems on Windows

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1809214 13f79535-47bb-0310-9956-ffa450edef68
hbyk3344 · Sep 21, 2017 · fbd42a0 · fbd42a0
1 parent 3f48670
commit fbd42a0
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
@@ -115,6 +115,12 @@ protected final File file(String name, boolean mustExist) {
         //
         // In all cases, a mis-match here results in the resource not being
         // found
+        //
+        // absPath is normalized so canPath needs to be normalized as well
+        // Can't normalize canPath earlier as canonicalBase is not normalized
+        if (canPath.length() > 0) {
+            canPath = normalize(canPath);
+        }
         if (!canPath.equals(absPath)) {
             return null;
         }