Merge pull request Lawouach#147 from szweep/validcertfix

Lawouach · Lawouach · commit cb048db433f0 · 2014-09-28T09:13:23.000+02:00
pass ssl_options to SSLIOStream() to ensure certificate validation works
diff --git a/ws4py/client/tornadoclient.py b/ws4py/client/tornadoclient.py
@@ -33,10 +33,9 @@ def closed(self, code, reason=None):
         """
         WebSocketBaseClient.__init__(self, url, protocols, extensions,
                                      ssl_options=ssl_options, headers=headers)
-        self.ssl_options["do_handshake_on_connect"] = False
         if self.scheme == "wss":
-            self.sock = ssl.wrap_socket(self.sock, **self.ssl_options)
-            self.io = iostream.SSLIOStream(self.sock, io_loop)
+            self.sock = ssl.wrap_socket(self.sock, do_handshake_on_connect=False, **self.ssl_options)
+            self.io = iostream.SSLIOStream(self.sock, io_loop, ssl_options=self.ssl_options)
         else:
             self.io = iostream.IOStream(self.sock, io_loop)
         self.io_loop = io_loop
