billbarker 2004/01/12 20:58:35
Modified: util/java/org/apache/tomcat/util/net PoolTcpEndpoint.java
Log:
Move the call to setSocketOptions to prevent a potential DoS condition when using
SSL.
Reported By: Alex Chan <[EMAIL PROTECTED]>
Revision Changes Path
1.29 +4 -5
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java
Index: PoolTcpEndpoint.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- PoolTcpEndpoint.java 24 Nov 2003 23:01:21 -0000 1.28
+++ PoolTcpEndpoint.java 13 Jan 2004 04:58:34 -0000 1.29
@@ -574,7 +574,7 @@
}
}
if (null != s) {
-
+ endpoint.setSocketOptions( s );
try {
if(endpoint.getServerSocketFactory()!=null) {
endpoint.getServerSocketFactory().handshake(s);
@@ -601,7 +601,6 @@
con.setEndpoint(endpoint);
con.setSocket(s);
- endpoint.setSocketOptions( s );
endpoint.getConnectionHandler().processConnection(con, perThrData);
} catch (SocketException se) {
endpoint.log.error(
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]