remm 01/01/21 23:26:44
Modified: catalina/src/conf server.xml
catalina/src/share/org/apache/catalina/connector/http
HttpConnector.java
Log:
- Disable connection timeout if connectionTimeout value is < 0.
Added a note in the default config file on where that can be configured.
Revision Changes Path
1.18 +3 -1 jakarta-tomcat-4.1/catalina/src/conf/server.xml
Index: server.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.1/catalina/src/conf/server.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- server.xml 2001/01/20 19:45:58 1.17
+++ server.xml 2001/01/22 07:26:43 1.18
@@ -45,7 +45,9 @@
<!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
<Connector className="org.apache.catalina.connector.http.HttpConnector"
port="8080" minProcessors="5" maxProcessors="75"
- acceptCount="10" debug="0"/>
+ acceptCount="10" debug="0" connectionTimeout="60000"/>
+ <!-- Note : To disable connection timeouts, set connectionTimeout value
+ to -1 -->
<!-- Define an SSL HTTP/1.1 Connector on port 8443 -->
<!--
1.8 +6 -5
jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java
Index: HttpConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- HttpConnector.java 2001/01/11 19:12:08 1.7
+++ HttpConnector.java 2001/01/22 07:26:44 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v
1.7 2001/01/11 19:12:08 remm Exp $
- * $Revision: 1.7 $
- * $Date: 2001/01/11 19:12:08 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v
1.8 2001/01/22 07:26:44 remm Exp $
+ * $Revision: 1.8 $
+ * $Date: 2001/01/22 07:26:44 $
*
* ====================================================================
*
@@ -94,7 +94,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.7 $ $Date: 2001/01/11 19:12:08 $
+ * @version $Revision: 1.8 $ $Date: 2001/01/22 07:26:44 $
*/
@@ -762,7 +762,8 @@
Socket socket = null;
try {
socket = serverSocket.accept();
- socket.setSoTimeout(connectionTimeout);
+ if (connectionTimeout > 0)
+ socket.setSoTimeout(connectionTimeout);
} catch (IOException e) {
if (started && !stopped)
log("accept: ", e);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
