[Python-checkins] python/dist/src/Lib httplib.py,1.76,1.77 socket.py,1.41,1.42

[loewis@users.sourceforge.net]

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

Modified Files:
	httplib.py socket.py 
Log Message:
Always unwrap _socketobj in socket.ssl. Revert httplib.py 1.25. 
Fixes #754447.


Index: httplib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/httplib.py,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** httplib.py	12 May 2003 20:19:36 -0000	1.76
--- httplib.py	14 Jun 2003 13:30:53 -0000	1.77
***************
*** 957,964 ****
          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)
  
--- 957,961 ----
          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)
  

Index: socket.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/socket.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** socket.py	29 May 2003 14:36:57 -0000	1.41
--- socket.py	14 Jun 2003 13:30:53 -0000	1.42
***************
*** 66,79 ****
  
  _realsocket = socket
! if (sys.platform.lower().startswith("win")
!     or (hasattr(os, 'uname') and os.uname()[0] == "BeOS")
!     or sys.platform=="riscos"):
! 
!     if _have_ssl:
!         _realssl = ssl
!         def ssl(sock, keyfile=None, certfile=None):
!             if hasattr(sock, "_sock"):
!                 sock = sock._sock
!             return _realssl(sock, keyfile, certfile)
  
  # WSA error codes
--- 66,75 ----
  
  _realsocket = socket
! if _have_ssl:
!     _realssl = ssl
!     def ssl(sock, keyfile=None, certfile=None):
!         if hasattr(sock, "_sock"):
!             sock = sock._sock
!         return _realssl(sock, keyfile, certfile)
  
  # WSA error codes