remm 2003/02/10 01:57:37
Modified: coyote/src/java/org/apache/coyote/tomcat4 Constants.java
CoyoteConnector.java
Log:
- Also port the linger patch to that branch.
Revision Changes Path
1.5 +1 -0
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/Constants.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Constants.java 23 Sep 2002 00:12:26 -0000 1.4
+++ Constants.java 10 Feb 2003 09:57:37 -0000 1.5
@@ -72,6 +72,7 @@
public static final String Package = "org.apache.coyote.tomcat4";
+ public static final int DEFAULT_CONNECTION_LINGER = -1;
public static final int DEFAULT_CONNECTION_TIMEOUT = 60000;
public static final int PROCESSOR_IDLE = 0;
1.22 +35 -14
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
Index: CoyoteConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- CoyoteConnector.java 15 Jan 2003 15:15:13 -0000 1.21
+++ CoyoteConnector.java 10 Feb 2003 09:57:37 -0000 1.22
@@ -210,6 +210,13 @@
/**
+ * Linger value on the incoming connection.
+ * Note : a value inferior to 0 means no linger.
+ */
+ private int connectionLinger = Constants.DEFAULT_CONNECTION_LINGER;
+
+
+ /**
* Timeout value on the incoming connection.
* Note : a value of 0 means no timeout.
*/
@@ -369,6 +376,28 @@
/**
+ * Return the connection linger for this Connector.
+ */
+ public int getConnectionLinger() {
+
+ return (connectionLinger);
+
+ }
+
+
+ /**
+ * Set the connection linger for this Connector.
+ *
+ * @param count The new connection linge
+ */
+ public void setConnectionLinger(int connectionLinger) {
+
+ this.connectionLinger = connectionLinger;
+
+ }
+
+
+ /**
* Return the connection timeout for this Connector.
*/
public int getConnectionTimeout() {
@@ -694,16 +723,6 @@
/**
- * Return the protocol handler associated with the connector.
- */
- public ProtocolHandler getProtocolHandler() {
-
- return (this.protocolHandler);
-
- }
-
-
- /**
* Return the proxy server name for this Connector.
*/
public String getProxyName() {
@@ -1044,6 +1063,8 @@
"" + acceptCount);
IntrospectionUtils.setProperty(protocolHandler, "tcpNoDelay",
"" + tcpNoDelay);
+ IntrospectionUtils.setProperty(protocolHandler, "soLinger",
+ "" + connectionLinger);
IntrospectionUtils.setProperty(protocolHandler, "soTimeout",
"" + connectionTimeout);
IntrospectionUtils.setProperty(protocolHandler, "timeout",
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
