[Python-checkins] CVS: python/dist/src/Lib httplib.py,1.24,1.24.2.1

[Moshe Zadka]

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv12410/Lib

Modified Files:
      Tag: release20-maint
	httplib.py 
Log Message:
#123924: Windows - using OpenSSL, problem with socket in httplib.py.


Index: httplib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/httplib.py,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -C2 -r1.24 -r1.24.2.1
*** httplib.py	2000/10/12 19:58:36	1.24
--- httplib.py	2001/03/31 09:32:00	1.24.2.1
***************
*** 614,618 ****
          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)
          self.sock = FakeSocket(sock, ssl)
  
--- 614,621 ----
          sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
          sock.connect((self.host, self.port))
!         realsock = sock
!         if hasattr(sock, "_sock"):
!             realsock = sock._sock
!         ssl = socket.ssl(realsock, self.key_file, self.cert_file)
          self.sock = FakeSocket(sock, ssl)