mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 0f4170320ff37e971064916aed1dc (master) (#23285)

Browse source 
* chore: bump chromium in DEPS to 53836640273c3d45b05ad74bdff7323ef0ffc610

* chore: bump chromium in DEPS to 17da1064b910f4170320ff37e971064916aed1dc

* Rename attach_same_site_cookies param to force_ignore_site_for_cookies

2162209

* chore: update patch indices

* Remove single argument HttpResponseHeaders::AddHeader() method

2155353

* Rename attach_same_site_cookies param to force_ignore_site_for_cookies

2162209

* fixup! Remove single argument HttpResponseHeaders::AddHeader() method

* Exchange SandboxType::kInvalid for a CHECK.

2167995

* chore: fix string type on windows

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
Electron Bot 2020-04-30 13:20:44 -07:00 • committed by GitHub
parent 096c799e24
commit 8edc7a1fb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 143 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

15
shell/browser/net/electron_url_loader_factory.cc
View file

@ -112,13 +112,13 @@ network::mojom::URLResponseHeadPtr ToResponseHead(
if (dict.Get("headers", &headers)) {
for (const auto& iter : headers.DictItems()) {
if (iter.second.is_string()) {
// key: value
head->headers->AddHeader(iter.first + ": " + iter.second.GetString());
// key, value
head->headers->AddHeader(iter.first, iter.second.GetString());
} else if (iter.second.is_list()) {
// key: [values...]
for (const auto& item : iter.second.GetList()) {
if (item.is_string())
head->headers->AddHeader(iter.first + ": " + item.GetString());
head->headers->AddHeader(iter.first, item.GetString());
}
} else {
continue;
@ -135,7 +135,7 @@ network::mojom::URLResponseHeadPtr ToResponseHead(
// Setting |head->mime_type| does not automatically set the "content-type"
// header in NetworkService.
if (has_mime_type && !has_content_type)
head->headers->AddHeader("content-type: " + head->mime_type);
head->headers->AddHeader("content-type", head->mime_type);
return head;
}
@ -376,7 +376,8 @@ void ElectronURLLoaderFactory::StartLoadingFile(
return;
}
head->headers->AddHeader(kCORSHeader);
// Add header to ignore CORS.
head->headers->AddHeader("Access-Control-Allow-Origin", "*");
asar::CreateAsarURLLoader(request, std::move(loader), std::move(client),
head->headers);
}
@ -484,7 +485,9 @@ void ElectronURLLoaderFactory::SendContents(
std::string data) {
mojo::Remote<network::mojom::URLLoaderClient> client_remote(
std::move(client));
head->headers->AddHeader(kCORSHeader);
// Add header to ignore CORS.
head->headers->AddHeader("Access-Control-Allow-Origin", "*");
client_remote->OnReceiveResponse(std::move(head));
// Code bellow follows the pattern of data_url_loader_factory.cc.