billbarker 2005/08/27 17:52:14
Modified: catalina/src/share/org/apache/naming/resources
FileDirContext.java
Log:
Only normalize out backslash on Windows platforms.
On *nix systems, backslash is a perfectly valid (if somewhat strange :) file
name character, so Tomcat shouldn't deny access to files containing it.
Fix for Bug #36343
Revision Changes Path
1.10 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/FileDirContext.java
Index: FileDirContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FileDirContext.java 27 Jun 2005 21:54:35 -0000 1.9
+++ FileDirContext.java 28 Aug 2005 00:52:14 -0000 1.10
@@ -772,7 +772,7 @@
String normalized = path;
// Normalize the slashes and add leading slash if necessary
- if (normalized.indexOf('\\') >= 0)
+ if (File.separatorChar == '\\' && normalized.indexOf('\\') >= 0)
normalized = normalized.replace('\\', '/');
if (!normalized.startsWith("/"))
normalized = "/" + normalized;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
