Commit 5894dbda authored by Antoine Pitrou's avatar Antoine Pitrou

Hopefully fix sporadic Windows issue by avoiding calling getpeername()

on a freshly dup'ed socket.
parent 13ef831b
...@@ -83,6 +83,7 @@ from socket import socket, AF_INET, SOCK_STREAM ...@@ -83,6 +83,7 @@ from socket import socket, AF_INET, SOCK_STREAM
import base64 # for DER-to-PEM translation import base64 # for DER-to-PEM translation
import traceback import traceback
import errno import errno
import time
class SSLSocket(socket): class SSLSocket(socket):
...@@ -97,6 +98,7 @@ class SSLSocket(socket): ...@@ -97,6 +98,7 @@ class SSLSocket(socket):
family=AF_INET, type=SOCK_STREAM, proto=0, fileno=None, family=AF_INET, type=SOCK_STREAM, proto=0, fileno=None,
suppress_ragged_eofs=True, ciphers=None): suppress_ragged_eofs=True, ciphers=None):
connected = False
if sock is not None: if sock is not None:
socket.__init__(self, socket.__init__(self,
family=sock.family, family=sock.family,
...@@ -104,26 +106,27 @@ class SSLSocket(socket): ...@@ -104,26 +106,27 @@ class SSLSocket(socket):
proto=sock.proto, proto=sock.proto,
fileno=_dup(sock.fileno())) fileno=_dup(sock.fileno()))
self.settimeout(sock.gettimeout()) self.settimeout(sock.gettimeout())
# see if it's connected
try:
sock.getpeername()
except socket_error as e:
if e.errno != errno.ENOTCONN:
raise
else:
connected = True
sock.close() sock.close()
elif fileno is not None: elif fileno is not None:
socket.__init__(self, fileno=fileno) socket.__init__(self, fileno=fileno)
else: else:
socket.__init__(self, family=family, type=type, proto=proto) socket.__init__(self, family=family, type=type, proto=proto)
self._closed = False
if certfile and not keyfile: if certfile and not keyfile:
keyfile = certfile keyfile = certfile
# see if it's connected
try: self._closed = False
socket.getpeername(self)
except socket_error as e:
if e.errno != errno.ENOTCONN:
raise
# no, no connection yet
self._sslobj = None self._sslobj = None
else: if connected:
# yes, create the SSL object # create the SSL object
try: try:
self._sslobj = _ssl.sslwrap(self, server_side, self._sslobj = _ssl.sslwrap(self, server_side,
keyfile, certfile, keyfile, certfile,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment