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

Jump to bottom

Allow HTTP(S) schemes in the WebSocket constructor #45

Merged
merged 3 commits into from
May 12, 2023
Merged

Allow HTTP(S) schemes in the WebSocket constructor #45

merged 3 commits into from
May 12, 2023

Conversation

annevk
Copy link
Member

@annevk annevk commented May 11, 2023 •
edited by pr-preview bot
Loading

And thereby relative URLs. They are instantly normalized to the ws: and wss: schemes.

Tests: web-platform-tests/wpt#39955.

(See WHATWG Working Mode: Changes for more details.)

Preview | Diff
@devsnek @annevk
Allow HTTP(S) schemes in the WebSocket constructor
6fb220b 
And thereby relative URLs. They are instantly normalized to the ws: and wss: schemes.

Tests: web-platform-tests/wpt#39955.

Closes #37.
@annevk annevk requested a review from ricea May 11, 2023 09:25
This was referenced May 11, 2023
Closed
Merged
@zcorpan
Copy link
Member

zcorpan commented May 11, 2023

Mozilla is supportive of this change.
@annevk annevk enabled auto-merge (squash) May 11, 2023 15:04
This was referenced May 11, 2023
Closed
Open
webkit-commit-queue pushed a commit to annevk/WebKit that referenced this pull request May 11, 2023
@annevk
WebSocket: Allow relative URLs and http(s) scheme
b5e7897 
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
ricea
ricea reviewed May 12, 2023
View reviewed changes
index.bs Outdated Show resolved Hide resolved
@annevk @ricea
Update index.bs
4888245 
Co-authored-by: Adam Rice <ricea@chromium.org>
@annevk annevk disabled auto-merge May 12, 2023 07:52
zcorpan added a commit to web-platform-tests/wpt that referenced this pull request May 12, 2023
@zcorpan
Test base URL with multiple globals for WebSocket
da1d2ce 
See whatwg/websockets#45
@zcorpan zcorpan mentioned this pull request May 12, 2023
Merged
ricea
ricea approved these changes May 12, 2023
View reviewed changes
Copy link
Collaborator

@ricea ricea left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm
@annevk annevk merged commit 771cd4f into main May 12, 2023
1 check passed
@annevk annevk deleted the annevk/ws-http branch May 12, 2023 13:12
@zcorpan zcorpan mentioned this pull request May 15, 2023
Closed
zcorpan added a commit to web-platform-tests/wpt that referenced this pull request May 16, 2023
@zcorpan
Test base URL with multiple globals for WebSocket
9d415b8 
See whatwg/websockets#45
moz-v2v-gh pushed a commit to mozilla/gecko-dev that referenced this pull request May 22, 2023
@zcorpan @moz-wptsync-bot
Bug 1832781 [wpt PR 39978] - Test base URL with multiple globals for …
58596b3 
…WebSocket, a=testonly

Automatic update from web-platform-tests
Test base URL with multiple globals for WebSocket

See whatwg/websockets#45
--

wpt-commits: 9d415b811587ee14cd3d06a477ca98e26cb04929
wpt-pr: 39978
ErichDonGubler pushed a commit to ErichDonGubler/firefox that referenced this pull request May 23, 2023
@zcorpan @moz-wptsync-bot
Bug 1832781 [wpt PR 39978] - Test base URL with multiple globals for …
3b04de1 
…WebSocket, a=testonly

Automatic update from web-platform-tests
Test base URL with multiple globals for WebSocket

See whatwg/websockets#45
--

wpt-commits: 9d415b811587ee14cd3d06a477ca98e26cb04929
wpt-pr: 39978
@annevk annevk mentioned this pull request Aug 17, 2023
Closed
lpinca added a commit to websockets/ws that referenced this pull request Aug 20, 2023
@lpinca
[feature] Allow http(s) scheme in the WebSocket constructor
570da50 
Refs: whatwg/websockets#45
@lpinca lpinca mentioned this pull request Aug 20, 2023
Closed
lpinca added a commit to websockets/ws that referenced this pull request Aug 20, 2023
@lpinca
[feature] Allow http/https scheme
8ac03a0 
Allow HTTP(S) URLs to be used in the WebSocket constructor. They are
immediately converted to the ws and wss schemes.

Refs: whatwg/websockets#45
@lpinca lpinca mentioned this pull request Aug 20, 2023
Merged
lpinca added a commit to websockets/ws that referenced this pull request Aug 20, 2023
@lpinca
[feature] Allow http and https schemes
9b6b1d3 
Allow HTTP(S) URLs to be used in the WebSocket constructor. They are
immediately converted to the ws and wss schemes.

Refs: whatwg/websockets#45
lpinca added a commit to websockets/ws that referenced this pull request Aug 28, 2023
@lpinca
[feature] Allow http and https schemes (#2162)
347aab6 
Allow HTTP(S) URLs to be used in the WebSocket constructor. They are
immediately converted to the ws and wss schemes.

Refs: whatwg/websockets#45
@domenic domenic mentioned this pull request Sep 13, 2023
Open
@annevk annevk mentioned this pull request Oct 6, 2023
Closed
3 tasks
@CanadaHonk CanadaHonk mentioned this pull request Jan 22, 2024
Closed
@sapphi-red sapphi-red mentioned this pull request Mar 1, 2024
Merged
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
4 participants
@annevk @zcorpan @ricea @devsnek