larryi 02/04/26 18:55:18
Modified: src/facade22/org/apache/tomcat/facade
RequestDispatcherImpl.java
src/share/org/apache/tomcat/modules/generators
StaticInterceptor.java
Log:
For RequestDispatcher.forward, discard the child request from an include in
the RequestDispatchImpl.forward handling. Discarding it in StaticInterceptor
causes the internal test with <jsp:include page="static page" .../> to include
the calling JSP's source. Now all the internal tests pass, including the added
tests for Bugzilla 8092.
Revision Changes Path
1.25 +1 -1
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/RequestDispatcherImpl.java
Index: RequestDispatcherImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/RequestDispatcherImpl.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- RequestDispatcherImpl.java 13 Oct 2001 04:22:51 -0000 1.24
+++ RequestDispatcherImpl.java 27 Apr 2002 01:55:18 -0000 1.25
@@ -231,6 +231,7 @@
//realRequest.query().recycle();
realRequest.servletPath().recycle();
realRequest.pathInfo().recycle();
+ realRequest.setChild(null);
// merge query string as specified in specs - before, it may affect
// the way the request is handled by special interceptors
@@ -263,7 +264,6 @@
// in which case the attribute will create problems
realRequest.removeAttribute( A_REQUEST_URI);
realRequest.removeAttribute( A_SERVLET_PATH);
-
// CM should have set the wrapper - call it
Handler wr=realRequest.getHandler();
1.22 +1 -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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- StaticInterceptor.java 17 Apr 2002 02:41:49 -0000 1.21
+++ StaticInterceptor.java 27 Apr 2002 01:55:18 -0000 1.22
@@ -316,7 +316,7 @@
if(pathInfo == null) {
// If the attribute isn't there, then we aren't included.
// In that case, we must use the real request.
- subReq = req;
+ //*** DEBUG *** subReq = req;
pathInfo=subReq.servletPath().toString();
}
String absPath = (String)subReq.getNote( realFileNote );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
