You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2017/09/21 10:40:37 UTC
svn commit: r1809146 -
/tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
Author: markt
Date: Thu Sep 21 10:40:37 2017
New Revision: 1809146
URL: http://svn.apache.org/viewvc?rev=1809146&view=rev
Log:
Replacement of '\' with '/' should occur when the system file separator is '\'
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=1809146&r1=1809145&r2=1809146&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java Thu Sep 21 10:40:37 2017
@@ -122,7 +122,7 @@ public abstract class AbstractFileResour
* @param path Path to be normalized
*/
private String normalize(String path) {
- return RequestUtil.normalize(path, File.separatorChar == '/');
+ return RequestUtil.normalize(path, File.separatorChar == '\\');
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1809146 -
/tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
Posted by Mark Thomas <ma...@apache.org>.
On 21/09/17 11:40, markt@apache.org wrote:
> Author: markt
> Date: Thu Sep 21 10:40:37 2017
> New Revision: 1809146
>
> URL: http://svn.apache.org/viewvc?rev=1809146&view=rev
> Log:
> Replacement of '\' with '/' should occur when the system file separator is '\'
This breaks multiple unit tests in Windows because the canonical and
absolute paths no longer match.
The original change looks correct so I want to look further at what
might be the best way to fix this.
Mark
>
> 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=1809146&r1=1809145&r2=1809146&view=diff
> ==============================================================================
> --- tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java Thu Sep 21 10:40:37 2017
> @@ -122,7 +122,7 @@ public abstract class AbstractFileResour
> * @param path Path to be normalized
> */
> private String normalize(String path) {
> - return RequestUtil.normalize(path, File.separatorChar == '/');
> + return RequestUtil.normalize(path, File.separatorChar == '\\');
> }
>
> @Override
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org