cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardWrapperValve.java

[remm]

remm        01/03/08 21:03:52

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardWrapperValve.java
  Log:
  - Don't display status for 1xx and no content.
  
  Revision  Changes    Path
  1.20      +11 -5     
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java
  
  Index: StandardWrapperValve.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- StandardWrapperValve.java 2001/02/21 21:37:59     1.19
  +++ StandardWrapperValve.java 2001/03/09 05:03:51     1.20
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
 1.19 2001/02/21 21:37:59 craigmcc Exp $
  - * $Revision: 1.19 $
  - * $Date: 2001/02/21 21:37:59 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
 1.20 2001/03/09 05:03:51 remm Exp $
  + * $Revision: 1.20 $
  + * $Date: 2001/03/09 05:03:51 $
    *
    * ====================================================================
    *
  @@ -102,7 +102,7 @@
    * <code>StandardWrapper</code> container implementation.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.19 $ $Date: 2001/02/21 21:37:59 $
  + * @version $Revision: 1.20 $ $Date: 2001/03/09 05:03:51 $
    */
   
   final class StandardWrapperValve
  @@ -523,7 +523,7 @@
                                     ((HttpServletRequest) sreq).getRequestURI());
            sreq.setAttribute(Globals.EXCEPTION_TYPE_ATTR,
                                 realError.getClass());
  -         if (custom(request, response, errorPage))
  +            if (custom(request, response, errorPage))
                return;
        }
   
  @@ -774,11 +774,17 @@
        if (message == null)
            message = "";
   
  +     // Do nothing on a 1xx status
  +     if (statusCode < 200)
  +         return;
        // Do nothing on an OK status
        if (statusCode == HttpServletResponse.SC_OK)
            return;
        // Do nothing on a NO MODIFIED status
        if (statusCode == HttpServletResponse.SC_NOT_MODIFIED)
  +         return;
  +     // Do nothing on a NO CONTENT status
  +     if (statusCode == HttpServletResponse.SC_NO_CONTENT)
            return;
   
        // Handle a custom error page for this status code
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]