mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

When calling getpeername() in SSLSocket.__init__, only silence exceptions

Browse source 
caused by the "socket not connected" condition.
This commit is contained in:
Antoine Pitrou 2010-04-26 17:23:33 +00:00
parent 3bfa883207
commit 278d665c6a
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/ssl.py
View file

@ -78,6 +78,7 @@ from _ssl import \
from socket import socket, _fileobject, _delegate_methods, error as socket_error from socket import socket, _fileobject, _delegate_methods, error as socket_error
from socket import getnameinfo as _getnameinfo from socket import getnameinfo as _getnameinfo
import base64 # for DER-to-PEM translation import base64 # for DER-to-PEM translation
import errno
class SSLSocket(socket): class SSLSocket(socket):
@ -105,7 +106,9 @@ class SSLSocket(socket):
# see if it's connected # see if it's connected
try: try:
socket.getpeername(self) socket.getpeername(self)
except socket_error: except socket_error, e:
if e.errno != errno.ENOTCONN:
raise
# no, no connection yet # no, no connection yet
self._sslobj = None self._sslobj = None
else: else: