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 910e9e40d376 from chromium #29819

Merged
merged 2 commits into from Jun 23, 2021

Conversation

@ppontes
Copy link
Member

@ppontes ppontes commented Jun 21, 2021

[M90-LTS] Fix URLLoader cleanup on CorsURLLoaderFactory destruction.

Destroying one URLLoader can result in other URLLoaders getting errors,
due to to cache interconnectedness. CorsURLLoaderFactory's destructor
was not taking that into account.

Also fix a bonus bug: HttpCache::Transaction::response_ wasn't being
cleared in HttpCache::Transaction::DoHeadersPhaseCannotProceed(), which
could result in DCHECKs when calling GetResponseInfo() when a
transaction that was waiting on a cached response from another
transaction ended up failing.

[M90]: Fixed trivial conflict

(cherry picked from commit 2f49a3c69a2184c95f43a395e4f33a3959cb8dbc)

(cherry picked from commit baf23e3c5b1394982cff718a0e055d4f239245ad)

Bug: 1209769
Change-Id: I2c18caa488767a29011aca1e1b0bace24c1ba8fc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2922826
Reviewed-by: Maksim Orlovich morlovich@chromium.org
Commit-Queue: Matt Menke mmenke@chromium.org
Cr-Original-Original-Commit-Position: refs/heads/master@{#887522}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2935241
Auto-Submit: Matt Menke mmenke@chromium.org
Cr-Original-Commit-Position: refs/branch-heads/4472@{#1433}
Cr-Original-Branched-From: 3d60439cfb36485e76a1c5bb7f513d3721b20da1-refs/heads/master@{#870763}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2948654
Owners-Override: Victor-Gabriel Savu vsavu@google.com
Reviewed-by: Artem Sumaneev asumaneev@google.com
Reviewed-by: Matt Menke mmenke@chromium.org
Commit-Queue: Victor-Gabriel Savu vsavu@google.com
Cr-Commit-Position: refs/branch-heads/4430@{#1513}
Cr-Branched-From: e5ce7dc4f7518237b3d9bb93cccca35d25216cbe-refs/heads/master@{#857950}

Notes: Security: backported fix for CVE-2021-30553.

@ppontes ppontes force-pushed the cherry-pick/11-x-y/chromium/910e9e40d376 branch from abe5ebb to 87bbf12 Jun 22, 2021
zcbenz
zcbenz approved these changes Jun 23, 2021
@zcbenz zcbenz merged commit 9512604 into 11-x-y Jun 23, 2021
16 of 17 checks passed
@zcbenz zcbenz deleted the cherry-pick/11-x-y/chromium/910e9e40d376 branch Jun 23, 2021
@release-clerk
Copy link

@release-clerk release-clerk bot commented Jun 23, 2021

Release Notes Persisted

Security: backported fix for CVE-2021-30553.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants