LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-06-06 14:43:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Switch to blocking connect when using proxy (#1432)

Browse Source 
Until a better fix is found, this should help proxy users.
This commit is contained in:
ov7a 2020-04-12 15:28:40 +03:00 committed by GitHub
parent c0e523508b
commit 79fb1a54cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
telethon/network/connection/connection.py
View File

@ -65,7 +65,7 @@ class Connection(abc.ABC):
else: else:
s.set_proxy(*self._proxy) s.set_proxy(*self._proxy)
s.setblocking(False) s.settimeout(timeout)
await asyncio.wait_for( await asyncio.wait_for(
self._loop.sock_connect(s, address), self._loop.sock_connect(s, address),
timeout=timeout, timeout=timeout,
@ -78,14 +78,14 @@ class Connection(abc.ABC):
'without the SSL module being available' 'without the SSL module being available'
) )
s.settimeout(timeout)
s = ssl_mod.wrap_socket( s = ssl_mod.wrap_socket(
s, s,
do_handshake_on_connect=True, do_handshake_on_connect=True,
ssl_version=ssl_mod.PROTOCOL_SSLv23, ssl_version=ssl_mod.PROTOCOL_SSLv23,
ciphers='ADH-AES256-SHA' ciphers='ADH-AES256-SHA'
) )
s.setblocking(False)
s.setblocking(False)
self._reader, self._writer = \ self._reader, self._writer = \
await asyncio.open_connection(sock=s, loop=self._loop) await asyncio.open_connection(sock=s, loop=self._loop)