tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets DefaultServlet.java
Date Thu, 20 Dec 2001 12:25:07 GMT
remm        01/12/20 04:25:07

  Modified:    catalina/src/share/org/apache/catalina/servlets Tag:
                        tomcat_40_branch DefaultServlet.java
  Log:
  - Fix bug 5497.
    If headers will now be ignored when the default servlet is included.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.39.2.3  +8 -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.2
  retrieving revision 1.39.2.3
  diff -u -r1.39.2.2 -r1.39.2.3
  --- DefaultServlet.java	2001/10/05 17:09:28	1.39.2.2
  +++ DefaultServlet.java	2001/12/20 12:25:07	1.39.2.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
1.39.2.2 2001/10/05 17:09:28 remm Exp $
  - * $Revision: 1.39.2.2 $
  - * $Date: 2001/10/05 17:09:28 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
1.39.2.3 2001/12/20 12:25:07 remm Exp $
  + * $Revision: 1.39.2.3 $
  + * $Date: 2001/12/20 12:25:07 $
    *
    * ====================================================================
    *
  @@ -122,7 +122,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.39.2.2 $ $Date: 2001/10/05 17:09:28 $
  + * @version $Revision: 1.39.2.3 $ $Date: 2001/12/20 12:25:07 $
    */
   
   public class DefaultServlet
  @@ -1092,7 +1092,10 @@
           } else {
   
               // Checking If headers
  -            if ( !checkIfHeaders(request, response, resourceInfo) ) {
  +            boolean included =
  +                (request.getAttribute(Globals.REQUEST_URI_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