tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/webapps/docs cgi-howto.xml
Date Tue, 28 Sep 2004 22:19:33 GMT
markt       2004/09/28 15:19:33

  Modified:    catalina/src/conf Tag: TOMCAT_5_0 web.xml
               catalina/src/share/org/apache/catalina/servlets Tag:
                        TOMCAT_5_0 CGIServlet.java
               webapps/docs Tag: TOMCAT_5_0 cgi-howto.xml
  Log:
  Revert RFE 27090 as it introduced a JDK 1.4 dependency.
  Remove unused timeout parameter
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.39.2.2  +0 -12     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.2.1
  retrieving revision 1.39.2.2
  diff -u -r1.39.2.1 -r1.39.2.2
  --- web.xml	24 Aug 2004 23:14:51 -0000	1.39.2.1
  +++ web.xml	28 Sep 2004 22:19:32 -0000	1.39.2.2
  @@ -262,20 +262,12 @@
     <!--                       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]                          -->
     <!--                                                                      -->
     <!--   executable          Name of the exectuable used to run the script. -->
     <!--                       [perl]                                         -->
     <!--                                                                      -->
  -  <!--   parameterEncoding   Name of parameter encoding to be used with CGI -->
  -  <!--                       servlet.                                       -->
  -  <!--                       [System.getProperty("file.encoding","UTF-8")]  -->
  -  <!--                                                                      -->
     <!-- IMPORTANT: To use the CGI servlet, you also need to rename the       -->
     <!--            $CATALINA_HOME/server/lib/servlets-cgi.renametojar file   -->
     <!--            to $CATALINA_HOME/server/lib/servlets-cgi.jar             -->
  @@ -284,10 +276,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>
  
  
  
  No                   revision
  No                   revision
  1.22.2.1  +6 -17     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.22.2.1
  diff -u -r1.22 -r1.22.2.1
  --- CGIServlet.java	16 Jun 2004 18:22:20 -0000	1.22
  +++ CGIServlet.java	28 Sep 2004 22:19:32 -0000	1.22.2.1
  @@ -259,9 +259,6 @@
       /** 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
  @@ -273,10 +270,6 @@
       /** the command to use with the script */
       private String cgiExecutable = "perl";
       
  -    /** the encoding to use for parameters */
  -    private String parameterEncoding = System.getProperty("file.encoding",
  -                                                          "UTF-8");
  -
       /** object used to ensure multiple threads don't try to expand same file */
       static Object expandFileLock = new Object();
   
  @@ -314,9 +307,6 @@
               debug = Integer.parseInt(value);
               cgiPathPrefix =
                   getServletConfig().getInitParameter("cgiPathPrefix");
  -            value =
  -                getServletConfig().getInitParameter("iClientInputTimeout");
  -            iClientInputTimeout = Integer.parseInt(value);
           } catch (Throwable t) {
               //NOOP
           }
  @@ -728,8 +718,7 @@
                   if (param != null) {
                       String values[] = req.getParameterValues(param);
                       for (int i=0; i < values.length; i++) {
  -                        String value = URLEncoder.encode(values[i],
  -                                                         parameterEncoding);
  +                        String value = URLEncoder.encode(values[i]);
                           NameValuePair nvp = new NameValuePair(param, value);
                           queryParameters.add(nvp);
                       }
  
  
  
  No                   revision
  No                   revision
  1.4.2.1   +0 -6      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.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- cgi-howto.xml	19 Feb 2004 21:37:27 -0000	1.4
  +++ cgi-howto.xml	28 Sep 2004 22:19:33 -0000	1.4.2.1
  @@ -56,16 +56,10 @@
   <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
   run the script. Default is <code>perl</code>.</li>
  -<li><strong>parameterEncoding</strong> - Name of the parameter encoding
  -to be used with the GCI servlet. Default is
  -<code>System.getProperty("file.encoding","UTF-8")</code>.</li>
   </ul>
   </p>
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message