tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 Constants.java CoyoteConnector.java
Date Thu, 01 May 2003 11:26:53 GMT
remm        2003/05/01 04:26:53

  Modified:    catalina/src/share/org/apache/coyote/tomcat5 Constants.java
                        CoyoteConnector.java
  Log:
  - Add additional connection timeout configuration.
  
  Revision  Changes    Path
  1.2       +2 -0      jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/Constants.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Constants.java	19 Apr 2003 18:49:10 -0000	1.1
  +++ Constants.java	1 May 2003 11:26:53 -0000	1.2
  @@ -72,6 +72,8 @@
       public static final String Package = "org.apache.coyote.tomcat5";
       public static final int DEFAULT_CONNECTION_LINGER = -1;
       public static final int DEFAULT_CONNECTION_TIMEOUT = 60000;
  +    public static final int DEFAULT_CONNECTION_UPLOAD_TIMEOUT = 300000;
  +    public static final int DEFAULT_SERVER_SOCKET_TIMEOUT = 0;
   
       public static final int PROCESSOR_IDLE = 0;
       public static final int PROCESSOR_ACTIVE = 1;
  
  
  
  1.6       +63 -2     jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CoyoteConnector.java	27 Apr 2003 20:38:08 -0000	1.5
  +++ CoyoteConnector.java	1 May 2003 11:26:53 -0000	1.6
  @@ -221,6 +221,21 @@
   
   
       /**
  +     * Timeout value on the incoming connection during request processing.
  +     * Note : a value of 0 means no timeout.
  +     */
  +    private int connectionUploadTimeout = 
  +        Constants.DEFAULT_CONNECTION_UPLOAD_TIMEOUT;
  +
  +
  +    /**
  +     * Timeout value on the server socket.
  +     * Note : a value of 0 means no timeout.
  +     */
  +    private int serverSocketTimeout = Constants.DEFAULT_SERVER_SOCKET_TIMEOUT;
  +
  +
  +    /**
        * The port number on which we listen for requests.
        */
       private int port = 8080;
  @@ -446,6 +461,50 @@
   
   
       /**
  +     * Return the connection upload timeout for this Connector.
  +     */
  +    public int getConnectionUploadTimeout() {
  +
  +        return (connectionUploadTimeout);
  +
  +    }
  +
  +
  +    /**
  +     * Set the connection upload timeout for this Connector.
  +     *
  +     * @param connectionUploadTimeout The new connection upload timeout
  +     */
  +    public void setConnectionUploadTimeout(int connectionUploadTimeout) {
  +
  +        this.connectionUploadTimeout = connectionUploadTimeout;
  +
  +    }
  +
  +
  +    /**
  +     * Return the server socket timeout for this Connector.
  +     */
  +    public int getServerSocketTimeout() {
  +
  +        return (serverSocketTimeout);
  +
  +    }
  +
  +
  +    /**
  +     * Set the server socket timeout for this Connector.
  +     *
  +     * @param connectionUploadTimeout The new server socket timeout
  +     */
  +    public void setServerSocketTimeout(int serverSocketTimeout) {
  +
  +        this.serverSocketTimeout = serverSocketTimeout;
  +
  +    }
  +
  +
  +    /**
        * Return the accept count for this Connector.
        */
       public int getAcceptCount() {
  @@ -1140,7 +1199,9 @@
           IntrospectionUtils.setProperty(protocolHandler, "soTimeout",
                                          "" + connectionTimeout);
           IntrospectionUtils.setProperty(protocolHandler, "timeout",
  -                                       "" + connectionTimeout);
  +                                       "" + connectionUploadTimeout);
  +        IntrospectionUtils.setProperty(protocolHandler, "serverSoTimeout",
  +                                       "" + serverSocketTimeout);
           IntrospectionUtils.setProperty(protocolHandler, "disableUploadTimeout",
                                          "" + disableUploadTimeout);
           IntrospectionUtils.setProperty(protocolHandler, "maxKeepAliveRequests",
  
  
  

---------------------------------------------------------------------
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