jfarcand 2002/12/17 12:06:51 Modified: catalina/src/share/org/apache/catalina/servlets DefaultServlet.java InvokerServlet.java Log: Servlet 2.4 Specification addition ---------------------------------- SRV.8.4.2 Forwarded Request Parameters Except for servlets obtained by using the getNamedDispatcher method, a servlet being used from a servlet that has been invoked by another servlet using the forward method of RequestDispatcher. The following request attributes must be set: - javax.servlet.forward.request_uri - javax.servlet.forward.context_path - javax.servlet.forward.servlet_path - javax.servlet.forward.path_info - javax.servlet.forward.query_string Revision Changes Path 1.3 +5 -5 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java Index: DefaultServlet.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DefaultServlet.java 18 Sep 2002 13:17:31 -0000 1.2 +++ DefaultServlet.java 17 Dec 2002 20:06:49 -0000 1.3 @@ -969,7 +969,7 @@ // Checking If headers boolean included = - (request.getAttribute(Globals.CONTEXT_PATH_ATTR) != null); + (request.getAttribute(Globals.INCLUDE_CONTEXT_PATH_ATTR) != null); if (!included && !checkIfHeaders(request, response, resourceInfo)) { return; 1.4 +8 -8 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/InvokerServlet.java Index: InvokerServlet.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/InvokerServlet.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- InvokerServlet.java 7 Oct 2002 20:35:19 -0000 1.3 +++ InvokerServlet.java 17 Dec 2002 20:06:50 -0000 1.4 @@ -272,15 +272,15 @@ String inServletPath = null; String inPathInfo = null; boolean included = - (request.getAttribute(Globals.REQUEST_URI_ATTR) != null); + (request.getAttribute(Globals.INCLUDE_REQUEST_URI_ATTR) != null); if (included) { inRequestURI = - (String) request.getAttribute(Globals.REQUEST_URI_ATTR); + (String) request.getAttribute(Globals.INCLUDE_REQUEST_URI_ATTR); inServletPath = - (String) request.getAttribute(Globals.SERVLET_PATH_ATTR); + (String) request.getAttribute(Globals.INCLUDE_SERVLET_PATH_ATTR); inPathInfo = - (String) request.getAttribute(Globals.PATH_INFO_ATTR); + (String) request.getAttribute(Globals.INCLUDE_PATH_INFO_ATTR); } else { inRequestURI = request.getRequestURI(); inServletPath = request.getServletPath();
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>