amyroh 2003/12/08 17:54:33
Modified: catalina/src/share/org/apache/catalina/core
ApplicationFilterFactory.java
catalina/src/share/org/apache/catalina/realm RealmBase.java
Log:
Revert the patch. Seems like this case is already handled in the Mapper in TC5.
Revision Changes Path
1.13 +3 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationFilterFactory.java
Index: ApplicationFilterFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationFilterFactory.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ApplicationFilterFactory.java 9 Dec 2003 00:50:28 -0000 1.12
+++ ApplicationFilterFactory.java 9 Dec 2003 01:54:33 -0000 1.13
@@ -156,10 +156,6 @@
if (attribute != null){
requestPath = attribute.toString();
- int semicolon = requestPath.indexOf(";");
- if (semicolon >= 0) {
- requestPath = requestPath.substring(0, semicolon);
- }
}
HttpServletRequest hreq = null;
1.19 +4 -15
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java
Index: RealmBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- RealmBase.java 9 Dec 2003 00:50:58 -0000 1.18
+++ RealmBase.java 9 Dec 2003 01:54:33 -0000 1.19
@@ -461,17 +461,6 @@
if (contextPath.length() > 0)
uri = uri.substring(contextPath.length());
- if (uri != null) {
- int semicolon = uri.indexOf(";");
- if (semicolon >= 0) {
- String baseuri = uri.substring(0, semicolon);
- if (debug >= 2)
- log("Request uri '" + uri + "' treated as '" + baseuri +
- "' for security constraint matching.");
- uri = baseuri;
- }
- }
-
String method = hreq.getMethod();
for (int i = 0; i < constraints.length; i++) {
if (log.isDebugEnabled())
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
