tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r834504 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
Date Tue, 10 Nov 2009 15:33:50 GMT
Author: markt
Date: Tue Nov 10 15:33:50 2009
New Revision: 834504

URL: http://svn.apache.org/viewvc?rev=834504&view=rev
Log:
Prevent stack traces when closing ssl sockets after unwanted renegotiation attempt.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java?rev=834504&r1=834503&r2=834504&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java Tue Nov 10 15:33:50
2009
@@ -171,7 +171,10 @@
                 break;
             }
         }
-        ssl.setSoTimeout(oldTimeout);
+        // If legacy re-negotiation is disabled, socked could be closed here 
+        if (!ssl.isClosed()) {
+            ssl.setSoTimeout(oldTimeout);
+        }
         if (listener.completed == false) {
             throw new SocketException("SSL Cert handshake timeout");
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message