markt       2004/08/16 15:26:50

  Modified:    catalina/src/conf web.xml
               catalina/src/share/org/apache/catalina/servlets
                        CGIServlet.java
               webapps/docs cgi-howto.xml
  Log:
  
  
  Revision  Changes    Path
  1.40      +0 -8      jakarta-tomcat-catalina/catalina/src/conf/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/web.xml,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- web.xml   20 Apr 2004 22:22:04 -0000      1.39
  +++ web.xml   16 Aug 2004 22:26:49 -0000      1.40
  @@ -262,10 +262,6 @@
     <!--                       webAppRootDir + File.separator + this prefix.  -->
     <!--                       [WEB-INF/cgi]                                  -->
     <!--                                                                      -->
  -  <!--   clientInputTimeout  The time (in milliseconds) to wait for input   -->
  -  <!--                       from the browser before assuming that there    -->
  -  <!--                       is none.  [100]                                -->
  -  <!--                                                                      -->
     <!--   debug               Debugging detail level for messages logged     -->
     <!--                       by this servlet.  [0]                          -->
     <!--                                                                      -->
  @@ -284,10 +280,6 @@
       <servlet>
           <servlet-name>cgi</servlet-name>
           <servlet-class>org.apache.catalina.servlets.CGIServlet</servlet-class>
  -        <init-param>
  -          <param-name>clientInputTimeout</param-name>
  -          <param-value>100</param-value>
  -        </init-param>
           <init-param>
             <param-name>debug</param-name>
             <param-value>6</param-value>
  
  
  
  1.23      +5 -23     
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
  
  Index: CGIServlet.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- CGIServlet.java   16 Jun 2004 18:22:20 -0000      1.22
  +++ CGIServlet.java   16 Aug 2004 22:26:50 -0000      1.23
  @@ -247,21 +247,12 @@
   
       /* some vars below copied from Craig R. McClanahan's InvokerServlet */
   
  -    /** the string manager for this package. */
  -    /* YAGNI
  -    private static StringManager sm =
  -        StringManager.getManager(Constants.Package);
  -    */
  -
       /** the Context container associated with our web application. */
       private ServletContext context = null;
   
       /** the debugging detail level for this servlet. */
       private int debug = 0;
   
  -    /** the time in ms to wait for the client to send us CGI input data */
  -    private int iClientInputTimeout = 100;
  -
       /**
        *  The CGI search path will start at
        *    webAppRootDir + File.separator + cgiPathPrefix
  @@ -314,9 +305,6 @@
               debug = Integer.parseInt(value);
               cgiPathPrefix =
                   getServletConfig().getInitParameter("cgiPathPrefix");
  -            value =
  -                getServletConfig().getInitParameter("iClientInputTimeout");
  -            iClientInputTimeout = Integer.parseInt(value);
           } catch (Throwable t) {
               //NOOP
           }
  @@ -328,13 +316,7 @@
           }
           
           // Identify the internal container resources we need
  -        //Wrapper wrapper = (Wrapper) getServletConfig();
  -        //context = (Context) wrapper.getParent();
  -
           context = config.getServletContext();
  -        if (debug >= 1) {
  -            //log("init: Associated with Context '" + context.getPath() + "'");
  -        }
   
       }
   
  
  
  
  1.5       +0 -3      jakarta-tomcat-catalina/webapps/docs/cgi-howto.xml
  
  Index: cgi-howto.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/cgi-howto.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- cgi-howto.xml     19 Feb 2004 21:37:27 -0000      1.4
  +++ cgi-howto.xml     16 Aug 2004 22:26:50 -0000      1.5
  @@ -56,9 +56,6 @@
   <li><strong>cgiPathPrefix</strong> - The CGI search path will start at
   the web application root directory + File.separator + this prefix.
   The default cgiPathPrefix is <code>/WEB-INF/cgi</code></li>
  -<li><strong>clientInputTimeout</strong> - The time (in milliseconds) to
  -wait for input from the browser before assuming that there is none.
  -Default is <code>100</code> seconds.</li>
   <li><strong>debug</strong> - Debugging detail level for messages logged
   by this servlet. Default 0.</li>
   <li><strong>executable</strong> - The of the executable to be used to
  
  
  

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

Reply via email to