commit 638c91f6be6e4417f0d5d8d57886c9b74afabfbd
author James E. King III <jking@apache.org> Sat Jan 26 10:33:04 2019 -0500
committer James E. King III <jking@apache.org> Sun Jan 27 08:21:40 2019 -0500
tree 2ceeb35214e91e3df510777068cfa290f2285281
parent 5e23c4df5b8a2c7f36f807dc07dc897fd8a39763

THRIFT-1549: properly unwrap and close TSSLSocket in python

lib/py/src/transport/TSSLSocket.py

diff --git a/lib/py/src/transport/TSSLSocket.py b/lib/py/src/transport/TSSLSocket.py
index b54ca5d..00d1f10 100644
--- a/lib/py/src/transport/TSSLSocket.py
+++ b/lib/py/src/transport/TSSLSocket.py
@@ -263,6 +263,15 @@
         TSSLBase.__init__(self, False, host, kwargs)
         TSocket.TSocket.__init__(self, host, port, unix_socket)
 
+    def close(self):
+        try:
+            self.handle.settimeout(0.001)
+            self.handle = self.handle.unwrap()
+        except (ssl.SSLError, socket.error, OSError):
+            # could not complete shutdown in a reasonable amount of time.  bail.
+            pass
+        TSocket.TSocket.close(self)
+
     @property
     def validate(self):
         warnings.warn('validate is deprecated. please use cert_reqs instead',