markt 2004/08/16 15:29:34 Modified: catalina/src/conf web.xml catalina/src/share/org/apache/catalina/servlets CGIServlet.java webapps/tomcat-docs cgi-howto.xml Log: Housekeeping in CGI servlet Revision Changes Path 1.57 +0 -8 jakarta-tomcat-4.0/catalina/src/conf/web.xml Index: web.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/web.xml,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- web.xml 20 Apr 2004 22:21:09 -0000 1.56 +++ web.xml 16 Aug 2004 22:29:33 -0000 1.57 @@ -230,10 +230,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] --> <!-- --> @@ -252,10 +248,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.25 +7 -25 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java Index: CGIServlet.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- CGIServlet.java 16 Jun 2004 18:21:54 -0000 1.24 +++ CGIServlet.java 16 Aug 2004 22:29:33 -0000 1.25 @@ -291,21 +291,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 @@ -359,9 +350,6 @@ debug = Integer.parseInt(value); cgiPathPrefix = getServletConfig().getInitParameter("cgiPathPrefix"); - value = - getServletConfig().getInitParameter("iClientInputTimeout"); - iClientInputTimeout = Integer.parseInt(value); } catch (Throwable t) { //NOOP } @@ -373,13 +361,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.4 +0 -3 jakarta-tomcat-4.0/webapps/tomcat-docs/cgi-howto.xml Index: cgi-howto.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/cgi-howto.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cgi-howto.xml 19 Feb 2004 21:38:50 -0000 1.3 +++ cgi-howto.xml 16 Aug 2004 22:29:34 -0000 1.4 @@ -52,9 +52,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]