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.

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

chore: cherry-pick 39090918efac from chromium #31297

Merged
merged 3 commits into from Oct 8, 2021

Conversation

MarshallOfSound
Copy link
Member

Consider HTTPS and WSS schemes identically for FPS.

This modifies the FPS implementation to normalize wss:// URLs into
https:// URLs when determining the same-partiness of a request.

This allows SameParty cookies to be sent on same-party WSS connection
requests. A browsertest is included to verify this.

Bug: 1251688
Change-Id: Id277288982805e0d29c6683e0c13d4b7c7cfe359
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3182786
Reviewed-by: Maksim Orlovich morlovich@chromium.org
Reviewed-by: Shuran Huang shuuran@chromium.org
Commit-Queue: Chris Fredrickson cfredric@chromium.org
Cr-Commit-Position: refs/heads/main@{#925457}

Notes: Backported fix for 1251688.

@MarshallOfSound MarshallOfSound requested a review from a team as a code owner October 5, 2021 19:35
@MarshallOfSound MarshallOfSound added 15-x-y backport-check-skip Skip trop's backport validity checking semver/patch backwards-compatible bug fixes labels Oct 5, 2021
@electron-cation electron-cation bot added new-pr 🌱 PR opened in the last 24 hours and removed new-pr 🌱 PR opened in the last 24 hours labels Oct 5, 2021
Copy link
Member

@VerteDinde VerteDinde left a comment

Choose a reason for hiding this comment

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

LGTM!

@VerteDinde
Copy link
Member

@MarshallOfSound @ckerr Dug into this a bit today - I think we need one other commit cherry-picked in in order to make this commit build/work properly. I took a stab at it here for 16-x-y only (#31331) and all tests are passing so far. Let me know if you think cherry-picking both in is reasonable, happy to push my commits into this PR and the 15-x-y PR instead of making a new one 🙂

@VerteDinde VerteDinde force-pushed the cherry-pick/15-x-y/chromium/39090918efac branch from 6bb2dff to 194d854 Compare October 8, 2021 01:54
@VerteDinde VerteDinde merged commit 2cabee9 into 15-x-y Oct 8, 2021
@VerteDinde VerteDinde deleted the cherry-pick/15-x-y/chromium/39090918efac branch October 8, 2021 16:08
@release-clerk
Copy link

release-clerk bot commented Oct 8, 2021

Release Notes Persisted

Backported fix for 1251688.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
15-x-y backport-check-skip Skip trop's backport validity checking semver/patch backwards-compatible bug fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants