From d4e74812fe970904954c62947b550a91fa24bd11 Mon Sep 17 00:00:00 2001 From: Moshe Zadka Date: Sat, 31 Mar 2001 09:32:01 +0000 Subject: #123924: Windows - using OpenSSL, problem with socket in httplib.py. --- Lib/httplib.py | 5 ++++- Misc/NEWS | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Lib/httplib.py b/Lib/httplib.py index 2688359..2b32a1b 100644 --- a/Lib/httplib.py +++ b/Lib/httplib.py @@ -613,7 +613,10 @@ class HTTPSConnection(HTTPConnection): sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock.connect((self.host, self.port)) - ssl = socket.ssl(sock, self.key_file, self.cert_file) + realsock = sock + if hasattr(sock, "_sock"): + realsock = sock._sock + ssl = socket.ssl(realsock, self.key_file, self.cert_file) self.sock = FakeSocket(sock, ssl) diff --git a/Misc/NEWS b/Misc/NEWS index 6b4b134..8eda021 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -92,6 +92,8 @@ http://sourceforge.net/tracker/index.php?func=detail&aid=&group_id=5470&atid - #126863 - getopt long option handling fixed +- #123924 - httplib.py - Windows - using OpenSSL, problem with socket + What's New in Python 2.0? ========================= -- cgit v0.12