You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@locus.apache.org on 2000/02/04 00:41:30 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/request SimpleMapper.java
costin 00/02/03 15:41:29
Modified: src/share/org/apache/tomcat/core RequestDispatcherImpl.java
RequestInterceptor.java
src/share/org/apache/tomcat/request SimpleMapper.java
Removed: src/share/org/apache/tomcat/core IncludedResponse.java
Log:
- Removed IncludedResponse. The only use was to prevent setting headers, but it's
much simpler to just set a flag ( like protocol ) to prevent sending any flags.
In the current design even that is not needed - after the headers are sent, no
change will matter for the client.
Revision Changes Path
1.16 +2 -2 jakarta-tomcat/src/share/org/apache/tomcat/core/RequestDispatcherImpl.java
Index: RequestDispatcherImpl.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/RequestDispatcherImpl.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- RequestDispatcherImpl.java 2000/02/03 07:11:51 1.15
+++ RequestDispatcherImpl.java 2000/02/03 23:41:29 1.16
@@ -171,7 +171,7 @@
// Implement the spec that "no changes in response, only write"
// can also be done by setting the response to 0.9 mode ( as Apache does!)
- IncludedResponse iResponse = new IncludedResponse(realResponse);
+ // IncludedResponse iResponse = new IncludedResponse(realResponse);
// Here the spec is very special, pay attention
@@ -251,7 +251,7 @@
// now it's really strange: we call the wrapper on the subrequest
// for the realRequest ( since the real request will still have the
// original handler/wrapper )
- subRequest.getWrapper().handleRequest(realRequest.getFacade() , iResponse);
+ subRequest.getWrapper().handleRequest(realRequest.getFacade() , (HttpServletResponseFacade)response);
// After request, we want to restore the include attributes - for
// chained includes.
1.5 +5 -4 jakarta-tomcat/src/share/org/apache/tomcat/core/RequestInterceptor.java
Index: RequestInterceptor.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/RequestInterceptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RequestInterceptor.java 2000/02/03 07:11:52 1.4
+++ RequestInterceptor.java 2000/02/03 23:41:29 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/RequestInterceptor.java,v 1.4 2000/02/03 07:11:52 costin Exp $
- * $Revision: 1.4 $
- * $Date: 2000/02/03 07:11:52 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/RequestInterceptor.java,v 1.5 2000/02/03 23:41:29 costin Exp $
+ * $Revision: 1.5 $
+ * $Date: 2000/02/03 23:41:29 $
*
* ====================================================================
*
@@ -81,7 +81,8 @@
- /** Will detect the context path for a request
+ /** Will detect the context path for a request.
+ * It need to set: context, contextPath, lookupPath
*/
public int contextMap(Request request);
1.7 +0 -3 jakarta-tomcat/src/share/org/apache/tomcat/request/SimpleMapper.java
Index: SimpleMapper.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/SimpleMapper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SimpleMapper.java 2000/02/03 23:05:27 1.6
+++ SimpleMapper.java 2000/02/03 23:41:29 1.7
@@ -110,9 +110,6 @@
// final fix on response & request
// rresponse.setServerHeader(server.getServerHeader());
String ctxPath = ctx.getPath();
- String pathInfo =path.substring(ctxPath.length(),
- path.length());
-
String lookupPath=rrequest.getLookupPath();
// do not set it if it is already set or we have no