From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 10 Nov 2009 15:33:50 +0000 (+0000)
Subject: Prevent stack traces when closing ssl sockets after unwanted renegotiation attempt.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e28849bd376a2786c1c07f3b2d4cf8102257b949;p=tomcat7.0

Prevent stack traces when closing ssl sockets after unwanted renegotiation attempt.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834504 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESupport.java b/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
index dbc308465..39b629479 100644
--- a/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
@@ -171,7 +171,10 @@ class JSSESupport implements SSLSupport, SSLSessionManager {
                 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");
         }