SSLIOStream._do_ssl_handshake SSL error check

diff --git a/tornado/iostream.py b/tornado/iostream.py
index 4a4875936f9c6c368db8bc84a16f7bf7400ab862..2897fdc77f462f18d2d1850e9846df96467ef24b 100644 (file)
--- 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: