Author: remm Date: Wed Feb 1 15:52:44 2006 New Revision: 374205 URL: http://svn.apache.org/viewcvs?rev=374205&view=rev Log: - 38485: Fix minor regression setting connection timeout and a few others (the connection handler will be created after setting the properties, so setting defaults there is not an option).
Modified: tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11BaseProtocol.java tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Protocol.java Modified: tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11BaseProtocol.java URL: http://svn.apache.org/viewcvs/tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11BaseProtocol.java?rev=374205&r1=374204&r2=374205&view=diff ============================================================================== --- tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11BaseProtocol.java (original) +++ tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11BaseProtocol.java Wed Feb 1 15:52:44 2006 @@ -31,7 +31,6 @@ import org.apache.coyote.Adapter; import org.apache.coyote.ProtocolHandler; import org.apache.coyote.RequestGroupInfo; -import org.apache.coyote.RequestInfo; import org.apache.tomcat.util.net.PoolTcpEndpoint; import org.apache.tomcat.util.net.SSLImplementation; import org.apache.tomcat.util.net.SSLSupport; @@ -40,7 +39,6 @@ import org.apache.tomcat.util.net.TcpConnectionHandler; import org.apache.tomcat.util.res.StringManager; import org.apache.tomcat.util.threads.ThreadPool; -import org.apache.tomcat.util.threads.ThreadWithAttributes; /** @@ -54,6 +52,10 @@ public class Http11BaseProtocol implements ProtocolHandler { public Http11BaseProtocol() { + setSoLinger(Constants.DEFAULT_CONNECTION_LINGER); + setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT); + setServerSoTimeout(Constants.DEFAULT_SERVER_SOCKET_TIMEOUT); + setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY); } /** @@ -106,12 +108,7 @@ } protected Http11ConnectionHandler createConnectionHandler() { - Http11ConnectionHandler cHandler = new Http11ConnectionHandler( this ); - setSoLinger(Constants.DEFAULT_CONNECTION_LINGER); - setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT); - setServerSoTimeout(Constants.DEFAULT_SERVER_SOCKET_TIMEOUT); - setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY); - return cHandler ; + return new Http11ConnectionHandler( this ); } /** Start the protocol Modified: tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Protocol.java URL: http://svn.apache.org/viewcvs/tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Protocol.java?rev=374205&r1=374204&r2=374205&view=diff ============================================================================== --- tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Protocol.java (original) +++ tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Protocol.java Wed Feb 1 15:52:44 2006 @@ -62,12 +62,7 @@ } protected Http11ConnectionHandler createConnectionHandler() { - Http11ConnectionHandler cHandler = new JmxHttp11ConnectionHandler( this ); - setSoLinger(Constants.DEFAULT_CONNECTION_LINGER); - setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT); - setServerSoTimeout(Constants.DEFAULT_SERVER_SOCKET_TIMEOUT); - setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY); - return cHandler ; + return new JmxHttp11ConnectionHandler( this ) ; } ObjectName tpOname; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]