Crude fix for issue #855: automatically initiate SSL handshake in SSLIOStream.

Perhaps this should be exposed as an option instead?

diff --git a/tornado/iostream.py b/tornado/iostream.py
index cd97f9d30d5a941a1bff9c9316876844592aba22..9b10dc2c83cdf5ee6f4df70a09a297be1ab3129a 100644 (file)
--- a/tornado/iostream.py
+++ b/tornado/iostream.py
@@ -801,6 +801,10 @@ class SSLIOStream(IOStream):
         self._handshake_writing = False
         self._ssl_connect_callback = None
         self._server_hostname = None
+        self._initiate_handshake()
+
+    def _initiate_handshake(self):
+        self._add_io_state(self.io_loop.READ | self.io_loop.WRITE)
 
     def reading(self):
         return self._handshake_reading or super(SSLIOStream, self).reading()

diff --git a/tornado/test/iostream_test.py b/tornado/test/iostream_test.py
index 24f8eef4c3eeb208147d8fd403fb672524d86b6e..0675c4f7a39c7c14d5cb0319de1b4727bb8fef45 100644 (file)
--- a/tornado/test/iostream_test.py
+++ b/tornado/test/iostream_test.py
@@ -120,16 +120,6 @@ class TestIOStreamMixin(object):
 
         def accept_callback(connection, address):
             streams[0] = self._make_server_iostream(connection, **kwargs)
-            if isinstance(streams[0], SSLIOStream):
-                # HACK: The SSL handshake won't complete (and
-                # therefore the client connect callback won't be
-                # run)until the server side has tried to do something
-                # with the connection.  For these tests we want both
-                # sides to connect before we do anything else with the
-                # connection, so we must cause some dummy activity on the
-                # server.  If this turns out to be useful for real apps
-                # it should have a cleaner interface.
-                streams[0]._add_io_state(IOLoop.READ)
             self.stop()
 
         def connect_callback():