Replace ws-rs with async-tungstenite. #27164

jdm · 2020-07-03T16:15:06Z

This change moves us from ws-rs (which doesn't see a lot of maintainer activity) and its custom async implementation to tungstenite and the tokio ecosystem. This is particularly important because of #27043, which breaks SSL websockets on Windows.

Depends on sdroege/async-tungstenite#40.

./mach build -d does not report any errors
./mach test-tidy does not report any errors
These changes fix #27043
There are tests for these changes

highfive · 2020-07-03T16:15:11Z

Heads up! This PR modifies the following files:

@KiChjang: components/net/Cargo.toml, components/net/resource_thread.rs, components/net/websocket_loader.rs

jdm · 2020-07-03T16:16:24Z

tests/wpt/metadata/websockets/cookies/third-party-cookie-accepted.https.html.ini

@@ -0,0 +1,3 @@
+[third-party-cookie-accepted.https.html]


This new test failure shows up because tungstenite correctly passes through multiple Set-Cookie headers in the WS response, whereas ws-rs appears to silently drop all but the first.

jdm · 2020-07-03T16:16:52Z

r? @nox
Do you want to take a look at this?

nox · 2020-07-03T16:26:58Z

This looks cool! Will review on Monday!

jdm · 2020-07-03T18:00:11Z

@bors-servo try=wpt

bors-servo · 2020-07-03T18:00:16Z

⌛ Trying commit bed15c7 with merge 659d1b4...


        Auto merge of #27164 - jdm:tungstenite, r=<try>

Replace ws-rs with async-tungstenite. This change moves us from ws-rs (which doesn't see a lot of maintainer activity) and its custom async implementation to tungstenite and the tokio ecosystem. This is particularly important because of #27043, which breaks SSL websockets on Windows. Depends on sdroege/async-tungstenite#40. --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #27043 - [x] There are tests for these changes

bors-servo · 2020-07-03T18:43:04Z

💔 Test failed - status-taskcluster

jdm · 2020-07-03T18:50:40Z

@bors-servo try=wpt

bors-servo · 2020-07-03T18:50:45Z

⌛ Trying commit 7376630 with merge 1a8e80f...


        Auto merge of #27164 - jdm:tungstenite, r=<try>

Replace ws-rs with async-tungstenite. This change moves us from ws-rs (which doesn't see a lot of maintainer activity) and its custom async implementation to tungstenite and the tokio ecosystem. This is particularly important because of #27043, which breaks SSL websockets on Windows. Depends on sdroege/async-tungstenite#40. --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #27043 - [x] There are tests for these changes

bors-servo · 2020-07-03T19:28:26Z

💔 Test failed - status-taskcluster

jdm · 2020-07-03T20:13:59Z

Ok, the test failures appear to be related to the host replacement that happens for WPT which confuses openssl. I need to figure out what we do differently in HTTPS code that allows it to work.

jdm · 2020-07-03T21:53:38Z

@bors-servo try=wpt

bors-servo · 2020-07-03T21:53:43Z

⌛ Trying commit 806133d with merge e05cc5c...


        Auto merge of #27164 - jdm:tungstenite, r=<try>

Replace ws-rs with async-tungstenite. This change moves us from ws-rs (which doesn't see a lot of maintainer activity) and its custom async implementation to tungstenite and the tokio ecosystem. This is particularly important because of #27043, which breaks SSL websockets on Windows. Depends on sdroege/async-tungstenite#40. --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #27043 - [x] There are tests for these changes

bors-servo · 2020-07-03T22:51:18Z

💔 Test failed - status-taskcluster

jdm · 2020-07-08T16:29:22Z

@bors-servo retry

bors-servo · 2020-07-08T17:37:28Z

⌛ Testing commit 76198e4 with merge f5666f7...


        Auto merge of #27164 - jdm:tungstenite, r=nox

Replace ws-rs with async-tungstenite. This change moves us from ws-rs (which doesn't see a lot of maintainer activity) and its custom async implementation to tungstenite and the tokio ecosystem. This is particularly important because of #27043, which breaks SSL websockets on Windows. Depends on sdroege/async-tungstenite#40. --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #27043 - [x] There are tests for these changes

bors-servo · 2020-07-08T17:41:24Z

💔 Test failed - status-taskcluster

jdm · 2020-07-08T19:53:02Z

@bors-servo retry

bors-servo · 2020-07-08T19:53:08Z

⌛ Testing commit 76198e4 with merge d6e29a8...


        Auto merge of #27164 - jdm:tungstenite, r=nox

Replace ws-rs with async-tungstenite. This change moves us from ws-rs (which doesn't see a lot of maintainer activity) and its custom async implementation to tungstenite and the tokio ecosystem. This is particularly important because of #27043, which breaks SSL websockets on Windows. Depends on sdroege/async-tungstenite#40. --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #27043 - [x] There are tests for these changes

bors-servo · 2020-07-08T19:57:18Z

💔 Test failed - status-taskcluster

jdm · 2020-07-08T20:00:34Z

@bors-servo retry

bors-servo · 2020-07-08T20:48:54Z

⌛ Testing commit 76198e4 with merge ed82722...

bors-servo · 2020-07-08T21:50:14Z

☀️ Test successful - status-taskcluster
Approved by: nox
Pushing ed82722 to master...


        Auto merge of #27300 - jdm:no-ws-host, r=asajeffrey

Remove explicit Host header from websocket connection. This was a regression from #27164, and fixing it allows hubs.mozilla.com to work again.


        Auto merge of #27300 - jdm:no-ws-host, r=asajeffrey

Remove explicit Host header from websocket connection. This was a regression from #27164, and fixing it allows hubs.mozilla.com to work again.

highfive assigned SimonSapin Jul 3, 2020

highfive added the S-awaiting-review label Jul 3, 2020

jdm reviewed Jul 3, 2020

View changes

highfive assigned nox and unassigned SimonSapin Jul 3, 2020

highfive added the S-tests-failed label Jul 3, 2020

jdm force-pushed the jdm:tungstenite branch from bed15c7 to 7376630 Jul 3, 2020

highfive removed the S-tests-failed label Jul 3, 2020

highfive added the S-tests-failed label Jul 3, 2020

jdm force-pushed the jdm:tungstenite branch from 7376630 to 806133d Jul 3, 2020

highfive removed the S-tests-failed label Jul 3, 2020

highfive added the S-tests-failed label Jul 3, 2020

jdm force-pushed the jdm:tungstenite branch from 806133d to 46d4b46 Jul 3, 2020

highfive removed the S-tests-failed label Jul 3, 2020

highfive added the S-tests-failed label Jul 8, 2020

highfive added S-awaiting-merge and removed S-tests-failed labels Jul 8, 2020

highfive added S-tests-failed and removed S-awaiting-merge labels Jul 8, 2020

highfive added S-awaiting-merge and removed S-tests-failed labels Jul 8, 2020

highfive added S-tests-failed and removed S-awaiting-merge labels Jul 8, 2020

highfive added S-awaiting-merge and removed S-tests-failed labels Jul 8, 2020

bors-servo merged commit ed82722 into servo:master Jul 8, 2020
2 checks passed

2 checks passed

Community-TC (pull_request) TaskGroup: success
Details

homu Test successful
Details

highfive removed the S-awaiting-merge label Jul 8, 2020

bors-servo mentioned this pull request Jul 8, 2020

Update various dependencies #27207

Merged

atouchet mentioned this pull request Jul 8, 2020

Update Tokio and Hyper in net component #26933

Open

jdm mentioned this pull request Jul 16, 2020

Remove explicit Host header from websocket connection. #27300

Merged

servo / servo

Replace ws-rs with async-tungstenite. #27164

Replace ws-rs with async-tungstenite. #27164

jdm commented Jul 3, 2020 •

edited

highfive commented Jul 3, 2020

This comment has been minimized.

jdm commented Jul 3, 2020

nox commented Jul 3, 2020

jdm commented Jul 3, 2020

bors-servo commented Jul 3, 2020

bors-servo commented Jul 3, 2020

jdm commented Jul 3, 2020

bors-servo commented Jul 3, 2020

bors-servo commented Jul 3, 2020

jdm commented Jul 3, 2020

jdm commented Jul 3, 2020

bors-servo commented Jul 3, 2020

bors-servo commented Jul 3, 2020

jdm commented Jul 8, 2020

bors-servo commented Jul 8, 2020

bors-servo commented Jul 8, 2020

jdm commented Jul 8, 2020

bors-servo commented Jul 8, 2020

bors-servo commented Jul 8, 2020

jdm commented Jul 8, 2020

bors-servo commented Jul 8, 2020

bors-servo commented Jul 8, 2020

servo / servo

Join GitHub today

Replace ws-rs with async-tungstenite. #27164

Replace ws-rs with async-tungstenite. #27164

Conversation

jdm commented Jul 3, 2020 • edited

highfive commented Jul 3, 2020

This comment has been minimized.

jdm Jul 3, 2020

jdm commented Jul 3, 2020

nox commented Jul 3, 2020

jdm commented Jul 3, 2020

bors-servo commented Jul 3, 2020

bors-servo commented Jul 3, 2020

jdm commented Jul 3, 2020

bors-servo commented Jul 3, 2020

bors-servo commented Jul 3, 2020

jdm commented Jul 3, 2020

jdm commented Jul 3, 2020

bors-servo commented Jul 3, 2020

bors-servo commented Jul 3, 2020

jdm commented Jul 8, 2020

bors-servo commented Jul 8, 2020

bors-servo commented Jul 8, 2020

jdm commented Jul 8, 2020

bors-servo commented Jul 8, 2020

bors-servo commented Jul 8, 2020

jdm commented Jul 8, 2020

bors-servo commented Jul 8, 2020

bors-servo commented Jul 8, 2020

jdm commented Jul 3, 2020 •

edited