Merge branch 'master' of git://github.com/spesmilo/electrum
This commit is contained in:
commit
bade574188
|
@ -154,6 +154,8 @@ class TcpInterface(threading.Thread):
|
||||||
try:
|
try:
|
||||||
s = socket.socket(res[0], socket.SOCK_STREAM)
|
s = socket.socket(res[0], socket.SOCK_STREAM)
|
||||||
s.connect(res[4])
|
s.connect(res[4])
|
||||||
|
s.settimeout(2)
|
||||||
|
s.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
|
||||||
return s
|
return s
|
||||||
except BaseException as e:
|
except BaseException as e:
|
||||||
continue
|
continue
|
||||||
|
@ -181,6 +183,8 @@ class TcpInterface(threading.Thread):
|
||||||
# get server certificate.
|
# get server certificate.
|
||||||
# Do not use ssl.get_server_certificate because it does not work with proxy
|
# Do not use ssl.get_server_certificate because it does not work with proxy
|
||||||
s = self.get_simple_socket()
|
s = self.get_simple_socket()
|
||||||
|
if s is None:
|
||||||
|
return
|
||||||
try:
|
try:
|
||||||
s = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_SSLv23, cert_reqs=ssl.CERT_NONE, ca_certs=None)
|
s = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_SSLv23, cert_reqs=ssl.CERT_NONE, ca_certs=None)
|
||||||
except ssl.SSLError, e:
|
except ssl.SSLError, e:
|
||||||
|
@ -202,9 +206,6 @@ class TcpInterface(threading.Thread):
|
||||||
if s is None:
|
if s is None:
|
||||||
return
|
return
|
||||||
|
|
||||||
s.settimeout(2)
|
|
||||||
s.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
|
|
||||||
|
|
||||||
if self.use_ssl:
|
if self.use_ssl:
|
||||||
try:
|
try:
|
||||||
s = ssl.wrap_socket(s,
|
s = ssl.wrap_socket(s,
|
||||||
|
|
Loading…
Reference in New Issue