Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Force legacy ws subprotocol when using gateway #1311

Merged
merged 4 commits into from
Jan 4, 2024
Merged

Force legacy ws subprotocol when using gateway #1311

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c46959
Force legacy ws subprotocol when using gateway
Aug 9, 2023
9a05466
Update jupyter_server/gateway/connections.py
Zsailer Jan 4, 2024
51fac8e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 4, 2024
bb1c528
Merge branch 'main' into gateway-force-legacy-ws-protocol
Zsailer Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion jupyter_server/gateway/connections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from tornado.escape import json_decode, url_escape, utf8
from tornado.httpclient import HTTPRequest
from tornado.ioloop import IOLoop
from traitlets import Bool, Instance, Int
from traitlets import Bool, Instance, Int, Unicode

from ..services.kernels.connection.base import BaseKernelWebsocketConnection
from ..utils import url_path_join
Expand All @@ -30,6 +30,10 @@ class GatewayWebSocketConnection(BaseKernelWebsocketConnection):

retry = Int(0)

# When opening ws connection to gateway, server already negotiated subprotocol with notebook client.
# Same protocol must be used for client and gateway, so legacy ws subprotocol for client is enforced here.
kernel_ws_protocol = Unicode("")
Zsailer marked this conversation as resolved.
Show resolved Hide resolved

async def connect(self):
"""Connect to the socket."""
# websocket is initialized before connection
Expand Down
Loading