yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

browser(firefox): stop faking intercepting redirects (#2618)

Browse Source 
We just cannot do it, so we report redirects as intercepted: false.
This commit is contained in:
Dmitry Gozman 2020-06-18 10:40:34 -07:00 committed by GitHub
parent 02704e08c8
commit c544bffee3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser_patches/firefox/BUILD_NUMBER
View File

@ -1 +1 @@
1112 1113

15
browser_patches/firefox/juggler/NetworkObserver.js
View File

@ -334,23 +334,10 @@ class NetworkObserver {
const requestId = this._requestId(httpChannel); const requestId = this._requestId(httpChannel);
const isRedirect = this._redirectMap.has(requestId); const isRedirect = this._redirectMap.has(requestId);
const interceptionEnabled = this._isInterceptionEnabledForPage(pageNetwork); const interceptionEnabled = this._isInterceptionEnabledForPage(pageNetwork);
if (!interceptionEnabled) { if (!interceptionEnabled || isRedirect) {
new NotificationCallbacks(this, pageNetwork, httpChannel, false); new NotificationCallbacks(this, pageNetwork, httpChannel, false);
this._sendOnRequest(httpChannel, false); this._sendOnRequest(httpChannel, false);
new ResponseBodyListener(this, pageNetwork, httpChannel); new ResponseBodyListener(this, pageNetwork, httpChannel);
} else if (isRedirect) {
// We pretend that redirect is interceptable in the protocol, although it's actually not
// and therefore we do not instantiate the interceptor.
// TODO: look into REDIRECT_MODE_MANUAL.
const interceptors = pageNetwork._ensureInterceptors();
interceptors.set(requestId, {
_resume: () => {},
_abort: () => {},
_fulfill: () => {},
});
new NotificationCallbacks(this, pageNetwork, httpChannel, false);
this._sendOnRequest(httpChannel, true);
new ResponseBodyListener(this, pageNetwork, httpChannel);
} else { } else {
const previousCallbacks = httpChannel.notificationCallbacks; const previousCallbacks = httpChannel.notificationCallbacks;
if (previousCallbacks instanceof Ci.nsIInterfaceRequestor) { if (previousCallbacks instanceof Ci.nsIInterfaceRequestor) {