costin 01/05/20 21:22:33
Modified: src/share/org/apache/tomcat/modules/aaa
AccessInterceptor.java
src/share/org/apache/tomcat/modules/server Http10.java
Log:
Removed the unescaping - to fix "double escaping" problems, and as a first
step in keeping the uri decoded.
Revision Changes Path
1.11 +0 -4
jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/AccessInterceptor.java
Index: AccessInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/AccessInterceptor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AccessInterceptor.java 2001/04/10 07:01:11 1.10
+++ AccessInterceptor.java 2001/05/21 04:22:32 1.11
@@ -257,10 +257,6 @@
// if we don't have any other constraints, return
if( ctxSec==null || ctxSec.patterns==0 ) return 0; // fast exit
- if (reqURIMB.indexOf('%') >= 0 || reqURIMB.indexOf( '+' ) >= 0) {
- log("Shouldn't happen - the request is decoded earlier");
- reqURIMB.unescapeURL();
- }
String reqURI = req.requestURI().toString();
String path=reqURI.substring( ctxPathLen);
String method=req.method().toString();
1.10 +7 -7
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10.java
Index: Http10.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Http10.java 2001/03/02 04:49:24 1.9
+++ Http10.java 2001/05/21 04:22:33 1.10
@@ -301,13 +301,13 @@
}
// Perform URL decoding only if necessary
- if ((uriMB.indexOf('%') >= 0) || (uriMB.indexOf('+') >= 0)) {
- try {
- uriMB.unescapeURL();
- } catch (Exception e) {
- return 400;
- }
- }
+ // if ((uriMB.indexOf('%') >= 0) || (uriMB.indexOf('+') >= 0)) {
+ // try {
+ // uriMB.unescapeURL();
+ // } catch (Exception e) {
+ // return 400;
+ // }
+ // }
// XXX what about query strings ?