mirror/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-03-09 12:50:23 -05:00
Code Activity

reset socket timeout before handing over to websockets

Browse source
This commit is contained in:
coletdjnz 2024-05-18 15:43:43 +12:00
parent 5078692aa2
commit 44da2e1323
No known key found for this signature in database
GPG key ID: 91984263BB39894A
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
test/test_http_proxy.py
View file

@ -156,6 +156,7 @@ def __init__(self, *args, proxy_info=None, **kwargs):
def handle(self): def handle(self):
import websockets.sync.server import websockets.sync.server
self.request.settimeout(None)
protocol = websockets.ServerProtocol() protocol = websockets.ServerProtocol()
connection = websockets.sync.server.ServerConnection(socket=self.request, protocol=protocol, close_timeout=2) connection = websockets.sync.server.ServerConnection(socket=self.request, protocol=protocol, close_timeout=2)
connection.handshake() connection.handshake()

5
yt_dlp/networking/_websockets.py
View file

@ -204,9 +204,12 @@ def _send(self, request):
ssl_context = WebsocketsSSLContext(self._make_sslcontext()) ssl_context = WebsocketsSSLContext(self._make_sslcontext())
else: else:
ssl_context = self._make_sslcontext() ssl_context = self._make_sslcontext()
sock = self._make_sock(proxy, request.url, timeout)
# We need to reset the timeout to not conflict with websocket handshake
sock.settimeout(None)
try: try:
conn = websockets.sync.client.connect( conn = websockets.sync.client.connect(
sock=self._make_sock(proxy, request.url, timeout), sock=sock,
uri=request.url, uri=request.url,
additional_headers=headers, additional_headers=headers,
open_timeout=timeout, open_timeout=timeout,