#123924: Windows - using OpenSSL, problem with socket in httplib.py.

diff --git a/Lib/httplib.py b/Lib/httplib.py
index 2688359308958afc6bb43c7a9a1dc1ae5bcb3949..2b32a1bb57ef67256818cf3f794bfe7f4521fcca 100644 (file)
--- 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 6b4b13432cda8d5ce3008733058e70754c83ca83..8eda0210c06dc6d1ff60f444416756afcfd75292 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -92,6 +92,8 @@ http://sourceforge.net/tracker/index.php?func=detail&aid=<id>&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?
 =========================