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

fix: make webRequest work with WebSocket #22040

Merged
merged 6 commits into from Feb 11, 2020
Merged

fix: make webRequest work with WebSocket #22040

merged 6 commits into from Feb 11, 2020

Conversation

zcbenz
Copy link
Member

@zcbenz zcbenz commented Feb 5, 2020

Description of Change

Close #21308.

This PR replaces #21754.

Checklist

Release Notes

Notes: Fix webRequest API not working with WebSockets.

@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Feb 5, 2020
@zcbenz zcbenz mentioned this pull request Feb 5, 2020
Closed
6 tasks
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Feb 6, 2020
@zcbenz zcbenz marked this pull request as ready for review February 7, 2020 13:17
deepak1556
deepak1556 approved these changes Feb 10, 2020
View reviewed changes
Copy link
Member

@deepak1556 deepak1556 left a comment

Choose a reason for hiding this comment

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

LGTM with minor changes

shell/browser/electron_browser_client.cc Outdated Show resolved Hide resolved
shell/browser/net/proxying_url_loader_factory.h Outdated Show resolved Hide resolved
shell/browser/net/proxying_websocket.cc Outdated Show resolved Hide resolved
shell/browser/net/proxying_websocket.cc Outdated Show resolved Hide resolved
shell/browser/net/proxying_websocket.cc Outdated Show resolved Hide resolved
@zcbenz zcbenz merged commit c608d6d into master Feb 11, 2020
@release-clerk
Copy link

release-clerk bot commented Feb 11, 2020

Release Notes Persisted

Fix webRequest API not working with WebSockets.

@zcbenz zcbenz deleted the web-request-web-socket branch February 11, 2020 05:56
@trop
Copy link
Contributor

trop bot commented Feb 11, 2020

I was unable to backport this PR to "7-1-x" cleanly;
you will need to perform this backport manually.

@trop trop bot removed the target/7-1-x label Feb 11, 2020
@trop
Copy link
Contributor

trop bot commented Feb 11, 2020

I was unable to backport this PR to "8-x-y" cleanly;
you will need to perform this backport manually.

@trop trop bot mentioned this pull request Feb 11, 2020
Merged
@trop
Copy link
Contributor

trop bot commented Feb 11, 2020

I have automatically backported this PR to "9-x-y", please check out #22133

zcbenz added a commit that referenced this pull request Feb 11, 2020
@zcbenz
fix: make webRequest work with WebSocket (#22040)
17c585a
@zcbenz zcbenz mentioned this pull request Feb 11, 2020
Merged
@trop
Copy link
Contributor

trop bot commented Feb 11, 2020

@zcbenz has manually backported this PR to "8-x-y", please check out #22134

@zcbenz zcbenz mentioned this pull request Feb 11, 2020
Merged
@trop
Copy link
Contributor

trop bot commented Feb 11, 2020

@zcbenz has manually backported this PR to "7-1-x", please check out #22141

@sofianguy sofianguy added this to Fixed in 9.0.0-beta.2 in 9-x-y Feb 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deepak1556 deepak1556 deepak1556 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
No open projects
9-x-y
Fixed in 9.0.0-beta.2
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

onBeforeSendHeaders behavior changed
2 participants
@zcbenz @deepak1556