WebSocket: allow HTTP(S) URLs #39955
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This makes it possible for people to pass relative URLs. They are immediately translated to the ws: or wss: scheme. This change also removes a number of redundant tests.
annevk
pushed a commit
to whatwg/websockets
that referenced
this pull request
May 11, 2023
And thereby relative URLs. They are instantly normalized to the ws: and wss: schemes. Tests: web-platform-tests/wpt#39955. Closes #37.
4 tasks
zcorpan
reviewed
May 11, 2023
webkit-commit-queue
pushed a commit
to annevk/WebKit
that referenced
this pull request
May 11, 2023
https://bugs.webkit.org/show_bug.cgi?id=247149 rdar://101929623 Reviewed by Antti Koivisto. This implements the change proposed at whatwg/websockets#45, allowing HTTP(S) URLs to be used in the WebSocket constructor. They are immediately converted to use ws: or wss: schemes. It also ensures that the HTTP(S) URLs always use UTF-8 for the query component of the URL, as is expected. The test changes are being upstreamed via web-platform-tests/wpt#39955. * LayoutTests/TestExpectations: * LayoutTests/http/tests/websocket/tests/hybi/url-parsing-expected.txt: * LayoutTests/http/tests/websocket/tests/hybi/url-parsing.html: * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-http-urls.any-expected.txt: Added. * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-http-urls.any.html: Added. * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-http-urls.any.js: Added. (test): * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-http-urls.any.worker-expected.txt: Added. * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-http-urls.any.worker.html: Added. * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-invalid-urls.any-expected.txt: Added. * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-invalid-urls.any.html: * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-invalid-urls.any.js: (string_appeared_here.forEach.input.test): (test): Deleted. * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-invalid-urls.any.worker-expected.txt: Added. * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-invalid-urls.any.worker.html: * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-invalid-urls.any.worker_wss-expected.txt: Removed. * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-invalid-urls.any_wss-expected.txt: Removed. * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-non-absolute-url.any-expected.txt: Added. * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-non-absolute-url.any.html: * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-non-absolute-url.any.js: (forEach.input.test): (test): Deleted. * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-non-absolute-url.any.worker-expected.txt: Added. * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-non-absolute-url.any.worker.html: * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-non-absolute-url.any.worker_wss-expected.txt: Removed. * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-non-absolute-url.any_wss-expected.txt: Removed. * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-url-with-windows-1252-encoding-expected.txt: Added. * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-url-with-windows-1252-encoding.html: Added. * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-wrong-scheme.any.html: Removed. * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-wrong-scheme.any.js: Removed. * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-wrong-scheme.any.worker.html: Removed. * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-wrong-scheme.any.worker_wss-expected.txt: Removed. * LayoutTests/imported/w3c/web-platform-tests/websockets/Create-wrong-scheme.any_wss-expected.txt: Removed. * LayoutTests/imported/w3c/web-platform-tests/websockets/constants.sub.js: (CreateWebSocketNonAbsolute): Deleted. (CreateWebSocketNonWsScheme): Deleted. * LayoutTests/imported/w3c/web-platform-tests/websockets/constructor/002-expected.txt: Removed. * LayoutTests/imported/w3c/web-platform-tests/websockets/constructor/002.html: Removed. * LayoutTests/imported/w3c/web-platform-tests/websockets/constructor/002_wss-expected.txt: Removed. * LayoutTests/imported/w3c/web-platform-tests/websockets/constructor/w3c-import.log: * LayoutTests/imported/w3c/web-platform-tests/websockets/w3c-import.log: * LayoutTests/platform/glib/TestExpectations: * Source/WebCore/Modules/websockets/WebSocket.cpp: (WebCore::WebSocket::create): (WebCore::WebSocket::connect): Canonical link: https://commits.webkit.org/263968@main
zcorpan
approved these changes
May 11, 2023
annevk
added a commit
to whatwg/websockets
that referenced
this pull request
May 12, 2023
And thereby relative URLs. They are instantly normalized to the ws: and wss: schemes. Tests: web-platform-tests/wpt#39955 and web-platform-tests/wpt#39978. Co-authored-by: Gus Caplan <me@gus.host> Co-authored-by: Adam Rice <ricea@chromium.org>
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This makes it possible for people to pass relative URLs. They are immediately translated to the ws: or wss: scheme.
This change also removes a number of redundant tests.