larryi 01/01/14 12:39:12
Modified: src/share/org/apache/tomcat/util PrefixMapper.java
Log:
getLongestPrefixMatch() would enter a tight loop if the request URI didn't
map into a context. Now, if a match can't be found it returns null and
a 404 error page will be sent back to the client browser.
Revision Changes Path
1.7 +6 -3
jakarta-tomcat/src/share/org/apache/tomcat/util/PrefixMapper.java
Index: PrefixMapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/PrefixMapper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PrefixMapper.java 2000/12/08 23:18:54 1.6
+++ PrefixMapper.java 2001/01/14 20:39:12 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/PrefixMapper.java,v 1.6
2000/12/08 23:18:54 costin Exp $
- * $Revision: 1.6 $
- * $Date: 2000/12/08 23:18:54 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/PrefixMapper.java,v 1.7
2001/01/14 20:39:12 larryi Exp $
+ * $Revision: 1.7 $
+ * $Date: 2001/01/14 20:39:12 $
*
* ====================================================================
*
@@ -227,6 +227,9 @@
container = myMap.prefixMappedServlets.get(s);
if (container == null) {
+ // if empty string didn't map, time to give up
+ if ( s.length() == 0 )
+ break;
s=FileUtil.removeLast( s );
} else {
if( myMap.mapCacheEnabled ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
