From: Ben Darnell <ben@bendarnell.com>
Date: Wed, 25 Aug 2010 18:32:10 +0000 (-0700)
Subject: Don't swallow SSL errors - always reraise or return
X-Git-Tag: v1.1.0~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3e953ea0a0bedcb6e6cf2137c8de8299a5dbe1b;p=thirdparty%2Ftornado.git

Don't swallow SSL errors - always reraise or return
---

diff --git a/tornado/httpserver.py b/tornado/httpserver.py
index f031deb5a..dc6138298 100644
--- a/tornado/httpserver.py
+++ b/tornado/httpserver.py
@@ -226,18 +226,20 @@ class HTTPServer(object):
             if self.ssl_options is not None:
                 assert ssl, "Python 2.6+ and OpenSSL required for SSL"
                 try:
-                    connection = ssl.wrap_socket(connection, 
-                                                 server_side=True, 
-                                                 do_handshake_on_connect=False, 
+                    connection = ssl.wrap_socket(connection,
+                                                 server_side=True,
+                                                 do_handshake_on_connect=False,
                                                  **self.ssl_options)
                 except ssl.SSLError, err:
-                    logging.error("SSL Error in SSL wrap:", exc_info=True)
                     if err.args[0] == ssl.SSL_ERROR_EOF:
                         return connection.close()
+                    else:
+                        raise
                 except socket.error, err:
-                    logging.error("Socket Error in SSL wrap:", exc_info=True)
                     if err.args[0] == errno.ECONNABORTED:
                         return connection.close()
+                    else:
+                        raise
             try:
                 if self.ssl_options is not None:
                     stream = iostream.SSLIOStream(connection, io_loop=self.io_loop)