svn commit: r1809214 - /tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java

[ma...@apache.org]

Author: markt
Date: Thu Sep 21 20:10:12 2017
New Revision: 1809214

URL: http://svn.apache.org/viewvc?rev=1809214&view=rev
Log:
Correct regression in r1809146 that caused problems on Windows

Modified:
    tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java

Modified: tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java?rev=1809214&r1=1809213&r2=1809214&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java Thu Sep 21 20:10:12 2017
@@ -115,6 +115,12 @@ public abstract class AbstractFileResour
         //
         // 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;
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org