remm 2002/10/07 13:33:31
Modified: catalina/src/share/org/apache/catalina/servlets Tag:
tomcat_40_branch InvokerServlet.java
Log:
- Port patch.
- Proposed fix for 13365. Please review.
Revision Changes Path
No revision
No revision
1.13.2.4 +12 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/InvokerServlet.java
Index: InvokerServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/InvokerServlet.java,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -u -r1.13.2.3 -r1.13.2.4
--- InvokerServlet.java 24 Sep 2002 08:32:43 -0000 1.13.2.3
+++ InvokerServlet.java 7 Oct 2002 20:33:31 -0000 1.13.2.4
@@ -342,6 +342,14 @@
if (wrapper == null)
wrapper = (Wrapper) context.findChild(name);
if (wrapper != null) {
+ String actualServletClass = wrapper.getServletClass();
+ if ((actualServletClass != null)
+ && (actualServletClass.startsWith
+ ("org.apache.catalina"))) {
+ response.sendError(HttpServletResponse.SC_NOT_FOUND,
+ inRequestURI);
+ return;
+ }
if (debug >= 1)
log("Using wrapper for servlet '" +
wrapper.getName() + "' with mapping '" +
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
