remm 2004/01/23 15:04:09
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java
catalina/src/share/org/apache/catalina/startup
HostConfig.java
Log:
- Bug 26010: '_' was an inappropriate character to replace the path separator,
since it's a common character in HTTP. Experiment with using '#' instead,
which is client side only.
Revision Changes Path
1.110 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- StandardContext.java 20 Jan 2004 23:07:36 -0000 1.109
+++ StandardContext.java 23 Jan 2004 23:04:09 -0000 1.110
@@ -4797,7 +4797,7 @@
if (path.equals("")) {
basename = "ROOT";
} else {
- basename = path.substring(1).replace('/', '_');
+ basename = path.substring(1).replace('/', '#');
}
return (basename + ".xml");
}
1.28 +5 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java
Index: HostConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- HostConfig.java 13 Jan 2004 16:57:16 -0000 1.27
+++ HostConfig.java 23 Jan 2004 23:04:09 -0000 1.28
@@ -502,7 +502,7 @@
// Calculate the context path and make sure it is unique
String file = files[i].substring(0, files[i].length() - 4);
- String contextPath = "/" + file.replace('_', '/');
+ String contextPath = "/" + file.replace('#', '/');
if (file.equals("ROOT")) {
contextPath = "";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
