From: Imre SZEBENYI <szeim@elte.hu>
Date: Wed, 27 Oct 2010 11:36:12 +0000 (+0200)
Subject: SSLIOStream._do_ssl_handshake SSL error check
X-Git-Tag: v1.2.0~90^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dbb05d5a09406b2369ee30661c88cd890b09e63;p=thirdparty%2Ftornado.git

SSLIOStream._do_ssl_handshake SSL error check
---

diff --git a/tornado/iostream.py b/tornado/iostream.py
index 4a4875936..2897fdc77 100644
--- a/tornado/iostream.py
+++ b/tornado/iostream.py
@@ -391,6 +391,9 @@ class SSLIOStream(IOStream):
             elif err.args[0] in (ssl.SSL_ERROR_EOF,
                                  ssl.SSL_ERROR_ZERO_RETURN):
                 return self.close()
+            elif err.args[0] == ssl.SSL_ERROR_SSL:
+                logging.warning("SSL Error on %d: %s", self.socket.fileno(), err)
+                return self.close()
             raise
         except socket.error, err:
             if err.args[0] == errno.ECONNABORTED: