reset socket timeout before handing over to websockets

pull/9625/head
coletdjnz 2 weeks ago
parent 5078692aa2
commit 44da2e1323
No known key found for this signature in database
GPG Key ID: 91984263BB39894A

@ -156,6 +156,7 @@ class WebSocketProxyHandler(BaseRequestHandler):
def handle(self):
import websockets.sync.server
self.request.settimeout(None)
protocol = websockets.ServerProtocol()
connection = websockets.sync.server.ServerConnection(socket=self.request, protocol=protocol, close_timeout=2)
connection.handshake()

@ -204,9 +204,12 @@ class WebsocketsRH(WebSocketRequestHandler):
ssl_context = WebsocketsSSLContext(self._make_sslcontext())
else:
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:
conn = websockets.sync.client.connect(
sock=self._make_sock(proxy, request.url, timeout),
sock=sock,
uri=request.url,
additional_headers=headers,
open_timeout=timeout,

Loading…
Cancel
Save