billbarker 02/04/17 20:08:04 Modified: catalina/src/share/org/apache/catalina/core Tag: tomcat_40_branch ApplicationHttpRequest.java catalina/src/share/org/apache/catalina/servlets Tag: tomcat_40_branch DefaultServlet.java Log: Port fix for bug #8092 from the HEAD branch. Reported by: Andreas Junghans [EMAIL PROTECTED] Revision Changes Path No revision No revision 1.10.2.1 +9 -6 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java Index: ApplicationHttpRequest.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -r1.10 -r1.10.2.1 --- ApplicationHttpRequest.java 22 Jul 2001 20:25:08 -0000 1.10 +++ ApplicationHttpRequest.java 18 Apr 2002 03:08:04 -0000 1.10.2.1 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v 1.10 2001/07/22 20:25:08 pier Exp $ - * $Revision: 1.10 $ - * $Date: 2001/07/22 20:25:08 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v 1.10.2.1 2002/04/18 03:08:04 billbarker Exp $ + * $Revision: 1.10.2.1 $ + * $Date: 2002/04/18 03:08:04 $ * * ==================================================================== * @@ -94,7 +94,7 @@ * keep these two classes in synchronization when making changes! * * @author Craig R. McClanahan - * @version $Revision: 1.10 $ $Date: 2001/07/22 20:25:08 $ + * @version $Revision: 1.10.2.1 $ $Date: 2002/04/18 03:08:04 $ */ class ApplicationHttpRequest extends HttpServletRequestWrapper { @@ -513,8 +513,11 @@ Enumeration names = request.getAttributeNames(); while (names.hasMoreElements()) { String name = (String) names.nextElement(); - Object value = request.getAttribute(name); - attributes.put(name, value); + if( ! ( Globals.REQUEST_URI_ATTR.equals(name) || + Globals.SERVLET_PATH_ATTR.equals(name) ) ) { + Object value = request.getAttribute(name); + attributes.put(name, value); + } } } No revision No revision 1.39.2.6 +5 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java Index: DefaultServlet.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v retrieving revision 1.39.2.5 retrieving revision 1.39.2.6 diff -u -r1.39.2.5 -r1.39.2.6 --- DefaultServlet.java 3 Jan 2002 10:44:32 -0000 1.39.2.5 +++ DefaultServlet.java 18 Apr 2002 03:08:04 -0000 1.39.2.6 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v 1.39.2.5 2002/01/03 10:44:32 remm Exp $ - * $Revision: 1.39.2.5 $ - * $Date: 2002/01/03 10:44:32 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v 1.39.2.6 2002/04/18 03:08:04 billbarker Exp $ + * $Revision: 1.39.2.6 $ + * $Date: 2002/04/18 03:08:04 $ * * ==================================================================== * @@ -122,7 +122,7 @@ * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision: 1.39.2.5 $ $Date: 2002/01/03 10:44:32 $ + * @version $Revision: 1.39.2.6 $ $Date: 2002/04/18 03:08:04 $ */ public class DefaultServlet @@ -1093,7 +1093,7 @@ // Checking If headers boolean included = - (request.getAttribute(Globals.REQUEST_URI_ATTR) != null); + (request.getAttribute(Globals.CONTEXT_PATH_ATTR) != null); if (!included && !checkIfHeaders(request, response, resourceInfo)) { return;
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>