tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billbar...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets DefaultServlet.java
Date Wed, 17 Apr 2002 05:50:00 GMT
billbarker    02/04/16 22:49:59

  Modified:    catalina/src/share/org/apache/catalina/core
                        ApplicationHttpRequest.java
               catalina/src/share/org/apache/catalina/servlets
                        DefaultServlet.java
  Log:
  Attempt to port the 3.3.x logic to 4.x.
  
  This fixes the examples in bug #8092.  I don't know what else it breaks (so I'm not porting
to the 4.0 branch).  I think that this is OK, but feel free to -1 if I'm breaking something
that I shouldn't be.
  
  Revision  Changes    Path
  1.11      +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.11
  diff -u -r1.10 -r1.11
  --- ApplicationHttpRequest.java	22 Jul 2001 20:25:08 -0000	1.10
  +++ ApplicationHttpRequest.java	17 Apr 2002 05:49:59 -0000	1.11
  @@ -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.11 2002/04/17 05:49:59 billbarker Exp $
  + * $Revision: 1.11 $
  + * $Date: 2002/04/17 05:49:59 $
    *
    * ====================================================================
    *
  @@ -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.11 $ $Date: 2002/04/17 05:49:59 $
    */
   
   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);
  +                }
               }
           }
   
  
  
  
  1.54      +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.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- DefaultServlet.java	16 Apr 2002 10:34:58 -0000	1.53
  +++ DefaultServlet.java	17 Apr 2002 05:49:59 -0000	1.54
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
1.53 2002/04/16 10:34:58 remm Exp $
  - * $Revision: 1.53 $
  - * $Date: 2002/04/16 10:34:58 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
1.54 2002/04/17 05:49:59 billbarker Exp $
  + * $Revision: 1.54 $
  + * $Date: 2002/04/17 05:49:59 $
    *
    * ====================================================================
    *
  @@ -125,7 +125,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.53 $ $Date: 2002/04/16 10:34:58 $
  + * @version $Revision: 1.54 $ $Date: 2002/04/17 05:49:59 $
    */
   
   public class DefaultServlet
  @@ -1163,7 +1163,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:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message