cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets SsiInvokerServlet.java

[bip]

bip         01/10/19 11:39:18

  Modified:    catalina/src/share/org/apache/catalina/servlets
                        SsiInvokerServlet.java
  Log:
  An addition that makes it possible to specify in web.xml if the SSI
  servlet should ignore unsupported/missspelled SSI Directives, set to
  false/0 by default.
  
  PR: 4261
  Submitted by: [EMAIL PROTECTED] (Rami Hänninen)
  
  Revision  Changes    Path
  1.10      +21 -6     
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/SsiInvokerServlet.java
  
  Index: SsiInvokerServlet.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/SsiInvokerServlet.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SsiInvokerServlet.java    2001/10/18 19:01:14     1.9
  +++ SsiInvokerServlet.java    2001/10/19 18:39:18     1.10
  @@ -1,8 +1,8 @@
   /*
    * SsiInvokerServlet.java
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/SsiInvokerServlet.java,v
 1.9 2001/10/18 19:01:14 bip Exp $
  - * $Revision: 1.9 $
  - * $Date: 2001/10/18 19:01:14 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/SsiInvokerServlet.java,v
 1.10 2001/10/19 18:39:18 bip Exp $
  + * $Revision: 1.10 $
  + * $Date: 2001/10/19 18:39:18 $
    *
    * ====================================================================
    *
  @@ -99,7 +99,7 @@
    *
    * @author Bip Thelin
    * @author Amy Roh
  - * @version $Revision: 1.9 $, $Date: 2001/10/18 19:01:14 $
  + * @version $Revision: 1.10 $, $Date: 2001/10/19 18:39:18 $
    */
   public final class SsiInvokerServlet extends HttpServlet {
       /** Debug level for this servlet. */
  @@ -111,6 +111,8 @@
       /** Expiration time in seconds for the doc. */
       private Long expires = null;
   
  +    /** Should we ignore unsupported/misspelled SSI Directives */
  +    private boolean ignoreUnsupportedDirective = false;
   
       /** virtual path can be webapp-relative */
       private boolean isVirtualWebappRelative = false;
  @@ -143,8 +145,19 @@
               ;
           }
   
  -        value = getServletConfig().getInitParameter("isVirtualWebappRelative");
  -        isVirtualWebappRelative = Integer.parseInt(value) > 0 ? true : false;
  +        try {
  +            value = getServletConfig().getInitParameter("isVirtualWebappRelative");
  +            isVirtualWebappRelative = Integer.parseInt(value) > 0 ? true : false;
  +        } catch (Throwable t) {
  +            ;
  +        }
  +
  +        try {
  +            value = 
getServletConfig().getInitParameter("ignoreUnsupportedDirective");
  +            ignoreUnsupportedDirective = Integer.parseInt(value) > 0 ? true : false;
  +        } catch (Throwable t) {
  +            ;
  +        }
   
           try {
               value = getServletConfig().getInitParameter("expires");
  @@ -308,6 +321,8 @@
                               out.write((ssiCommand.getStream(strParamType, 
strParam)).getBytes());
                           } else
                               ssiCommand.process(strParamType, strParam);
  +                    } else if(ignoreUnsupportedDirective && ssiCommand==null) {
  +                        ;
                       } else {
                           out.write(ssiMediator.getError());
                       }