Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

browser(firefox): fix extra HTTP headers in request interception (#11265)

Browse source
This commit is contained in:
Andrey Lushnikov 2022-01-08 09:26:11 -07:00 committed by GitHub
parent 913edf9bdb
commit 5d8aa8d5cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
browser_patches/firefox-beta/BUILD_NUMBER
View file

@ -1,2 +1,2 @@
1313 1314
Changed: lushnikov@chromium.org Wed 29 Dec 2021 09:04:48 PM PST Changed: lushnikov@chromium.org Sat Jan 8 18:49:01 MSK 2022

16
browser_patches/firefox-beta/juggler/NetworkObserver.js
View file

@ -62,6 +62,13 @@ class PageNetwork {
this._extraHTTPHeaders = headers; this._extraHTTPHeaders = headers;
} }
combinedExtraHTTPHeaders() {
return [
...(this._target.browserContext().extraHTTPHeaders || []),
...(this._extraHTTPHeaders || []),
];
}
enableRequestInterception() { enableRequestInterception() {
this._requestInterceptionEnabled = true; this._requestInterceptionEnabled = true;
} }
@ -151,11 +158,8 @@ class NetworkRequest {
this._expectingResumedRequest = undefined; // { method, headers, postData } this._expectingResumedRequest = undefined; // { method, headers, postData }
this._sentOnResponse = false; this._sentOnResponse = false;
const pageNetwork = this._pageNetwork; if (this._pageNetwork)
if (pageNetwork) { appendExtraHTTPHeaders(httpChannel, this._pageNetwork.combinedExtraHTTPHeaders());
appendExtraHTTPHeaders(httpChannel, pageNetwork._target.browserContext().extraHTTPHeaders);
appendExtraHTTPHeaders(httpChannel, pageNetwork._extraHTTPHeaders);
}
this._responseBodyChunks = []; this._responseBodyChunks = [];
@ -241,6 +245,8 @@ class NetworkRequest {
this.httpChannel.setRequestHeader(header.name, '', false /* merge */); this.httpChannel.setRequestHeader(header.name, '', false /* merge */);
for (const header of headers) for (const header of headers)
this.httpChannel.setRequestHeader(header.name, header.value, false /* merge */); this.httpChannel.setRequestHeader(header.name, header.value, false /* merge */);
} else if (this._pageNetwork) {
appendExtraHTTPHeaders(this.httpChannel, this._pageNetwork.combinedExtraHTTPHeaders());
} }
if (method) if (method)
this.httpChannel.requestMethod = method; this.httpChannel.requestMethod = method;

4
browser_patches/firefox/BUILD_NUMBER
View file

@ -1,2 +1,2 @@
1312 1313
Changed: lushnikov@chromium.org Tue Dec 28 13:12:02 MST 2021 Changed: lushnikov@chromium.org Sat Jan 8 18:49:01 MSK 2022

16
browser_patches/firefox/juggler/NetworkObserver.js
View file

@ -62,6 +62,13 @@ class PageNetwork {
this._extraHTTPHeaders = headers; this._extraHTTPHeaders = headers;
} }
combinedExtraHTTPHeaders() {
return [
...(this._target.browserContext().extraHTTPHeaders || []),
...(this._extraHTTPHeaders || []),
];
}
enableRequestInterception() { enableRequestInterception() {
this._requestInterceptionEnabled = true; this._requestInterceptionEnabled = true;
} }
@ -151,11 +158,8 @@ class NetworkRequest {
this._expectingResumedRequest = undefined; // { method, headers, postData } this._expectingResumedRequest = undefined; // { method, headers, postData }
this._sentOnResponse = false; this._sentOnResponse = false;
const pageNetwork = this._pageNetwork; if (this._pageNetwork)
if (pageNetwork) { appendExtraHTTPHeaders(httpChannel, this._pageNetwork.combinedExtraHTTPHeaders());
appendExtraHTTPHeaders(httpChannel, pageNetwork._target.browserContext().extraHTTPHeaders);
appendExtraHTTPHeaders(httpChannel, pageNetwork._extraHTTPHeaders);
}
this._responseBodyChunks = []; this._responseBodyChunks = [];
@ -241,6 +245,8 @@ class NetworkRequest {
this.httpChannel.setRequestHeader(header.name, '', false /* merge */); this.httpChannel.setRequestHeader(header.name, '', false /* merge */);
for (const header of headers) for (const header of headers)
this.httpChannel.setRequestHeader(header.name, header.value, false /* merge */); this.httpChannel.setRequestHeader(header.name, header.value, false /* merge */);
} else if (this._pageNetwork) {
appendExtraHTTPHeaders(this.httpChannel, this._pageNetwork.combinedExtraHTTPHeaders());
} }
if (method) if (method)
this.httpChannel.requestMethod = method; this.httpChannel.requestMethod = method;