Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 65700 invoked from network); 1 May 2003 11:27:02 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 1 May 2003 11:27:02 -0000 Received: (qmail 25209 invoked by uid 97); 1 May 2003 11:29:01 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@nagoya.betaversion.org Received: (qmail 25202 invoked from network); 1 May 2003 11:29:01 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by nagoya.betaversion.org with SMTP; 1 May 2003 11:29:01 -0000 Received: (qmail 64856 invoked by uid 500); 1 May 2003 11:26:54 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 64828 invoked by uid 500); 1 May 2003 11:26:54 -0000 Received: (qmail 64806 invoked from network); 1 May 2003 11:26:53 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 1 May 2003 11:26:53 -0000 Received: (qmail 96036 invoked by uid 1135); 1 May 2003 11:26:53 -0000 Date: 1 May 2003 11:26:53 -0000 Message-ID: <20030501112653.96035.qmail@icarus.apache.org> From: remm@apache.org To: jakarta-tomcat-catalina-cvs@apache.org Subject: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 Constants.java CoyoteConnector.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N 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