billbarker 2002/07/25 21:40:15
Modified: src/share/org/apache/tomcat/modules/generators
StaticInterceptor.java
Log:
Disallow extension-mapped servlets as mapped Welcome pages.
Without this, a Welcome File of "index.vm" will always match even if the file
doesn't exist (the case of "index.jsp" is special, which is why I missed this before).
This still allows JSPC generated servlets, since in that case the mapping is exact.
Revision Changes Path
1.26 +3 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/StaticInterceptor.java
Index: StaticInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/StaticInterceptor.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- StaticInterceptor.java 23 Jun 2002 03:32:31 -0000 1.25
+++ StaticInterceptor.java 26 Jul 2002 04:40:15 -0000 1.26
@@ -355,7 +355,9 @@
status=ri[j].contextMap( req );
if( status!=0 ) break;
}
- if(status == 0 && req.servletPath() != null &&
!req.servletPath().equals("")) {
+ if(status == 0 && req.servletPath() != null &&
+ ! req.servletPath().equals("") &&
+ req.getContainer().getMapType() != Container.EXTENSION_MAP) {
return req.servletPath().toString().substring(pathInfo.length());
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
