From 90946207d2aedd41fcfcf8e6d68b07fa5a834ada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= Date: Sat, 9 May 2015 07:56:49 +0000 Subject: close != shutdown fixes #612, see #613 --- urllib3/contrib/pyopenssl.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/urllib3/contrib/pyopenssl.py b/urllib3/contrib/pyopenssl.py index b2c34a89..c4de3359 100644 --- a/urllib3/contrib/pyopenssl.py +++ b/urllib3/contrib/pyopenssl.py @@ -208,9 +208,13 @@ class WrappedSocket(object): sent = self._send_until_done(data) data = data[sent:] + def shutdown(self): + # FIXME rethrow compatible exceptions should we ever use this + self.connection.shutdown() + def close(self): if self._makefile_refs < 1: - return self.connection.shutdown() + return self.connection.close() else: self._makefile_refs -= 1 -- cgit v1.2.1