4588a41161
* chore: bump chromium in DEPS to 1d6b29cd85c1c3cba093b8b69b2727cc26eaac97 * update patches * chore: use 'libvulkan.so.1' in the linux manifests CL: https://chromium-review.googlesource.com/c/angle/angle/+/2538430 Upstream renamed libvulkan.so to libvulkan.so.1, so sync our manifests. * chore: update expected window-open default policy. CL: https://chromium-review.googlesource.com/c/chromium/src/+/2429247 Upstream CL contiues the work to make `strict-origin-when-cross-origin` the default referrer policy. This commit changes our window-open tests to expect that policy over the previous `no-referrer-when-downgrade`. * chore: bump chromium in DEPS to 69cb7c65ad845cdab1cd5f4256237e72fceba2dd * chore: re-export chromium patches No code changes; just line numbers. `git am` failed because the upstream changes were just large enough to require patching to fail w/o fuzzing. The broken patch was patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch * update patches * chore: bump chromium in DEPS to c6d97a240d30e5f5166856f5ae6ee14d95b9a4f0 * update patches * fixup! chore: update expected window-open default policy. * chore: disallow copying CppHeapCreateParams Experimental commit to resolve FTBS https://ci.appveyor.com/project/electron-bot/electron-ljo26/builds/36405680#L25345 which introduces a new struct CppHeapCreateParams that aggregates a vector of unique_ptrs. Our Windows CI is unhappy that this struct implicitly deletes its copy ctor, so this commit makes it explicit. Xref: https://chromium-review.googlesource.com/c/v8/v8/+/2536642 * update patches * chore: bump chromium in DEPS to 0df9a85ffa0ad4711b41a089842e40b87ba88055 * update patches * fixup! chore: bump chromium to ac06d6903a2c981ab90a8162f1ba0 (master) (#26499) * chore: update calls to gfx::RemoveAcceleratorChar. The call signature for gfx::RemoveAccelerator changed in https://chromium-review.googlesource.com/c/chromium/src/+/2546471 . This commit updates use to match that. * chore: bump chromium in DEPS to 43d6c496251e08d3781bfadbe9727688551f74a9 * update patches * chore: bump chromium in DEPS to 1fb5c9825be4e2271c4fef0e802f5d970b32f62f * update patches * chore: bump chromium in DEPS to 8a1f078d67825e727a598b89a8924699df8d3850 * chore: bump chromium in DEPS to 28ff715b3a97d8cedc143bad671edb08b6de5fc2 * chore: update patches * Remove most service manifest remnants from Content https://chromium-review.googlesource.com/c/chromium/src/+/2296482 * Reland "Portals: Fix a11y for orphaned portals" https://chromium-review.googlesource.com/c/chromium/src/+/2542812 * Convert CallbackList::Subscription to a standalone class. https://chromium-review.googlesource.com/c/chromium/src/+/2522860 * fix: actually apply the zlib patch * chore: bump chromium in DEPS to 75b464e6357190ca302ba9ce8f8c2bf5a3b709ae * chore: update patches * chore: bump chromium@b884b9b2f647c59a75f5d2055030afa33d50ca10 * chore: bump chromium in DEPS to 829261dadcefdc54ce5fdf7c5fac2929786a63ce * chore: bump chromium in DEPS to 5df3e69605c7c0130374aaccb91fc4726a558db2 * chore: bump chromium in DEPS to 22db748d5b7b90f87e6e97ef4c92a727ac753ea4 * chore: bump chromium in DEPS to 1475df80282b7eeeb0e153d8375bfe651f083bf8 * chore: bump chromium in DEPS to 6d34fe9e9b7386edd90574617bfa4008de972d72 * chore: update patches * Disable CertVerifierService for now 2559260: Enable CertVerifierService by default | https://chromium-review.googlesource.com/c/chromium/src/+/2559260 * Remove force_ignore_site_for_cookies until we figure out what to do instead 2499162: Remove |force_ignore_site_for_cookies| from IPCs (e.g. ResourceRequest). | https://chromium-review.googlesource.com/c/chromium/src/+/2499162 * chore: bump chromium in DEPS to 95aeb1c59ebc03d19ba077b0cd707463d1b2865e * update patches * Set site_for_cookies to request url so that URLLoader::ShouldForceIgnoreSiteForCookies returns true * 2490383: a11y inspect reorg: implement accessible tree formatter factory https://chromium-review.googlesource.com/c/chromium/src/+/2490383 * 2485887: [Extensions][web_accessible_resources] Use |matches|. https://chromium-review.googlesource.com/c/chromium/src/+/2485887 * update v8 headers * chore: bump chromium in DEPS to 38587dc379a8cf4d4a13e482a6e89f2fe681144e * update patches * 2555005: [api] Simplify ScriptOrigin https://chromium-review.googlesource.com/c/v8/v8/+/2555005 * 2563553: Remove Flash from PermissionRequestTypes and PermissionTypes. https://chromium-review.googlesource.com/c/chromium/src/+/2563553 * 2546146: Remove browser-hosted InterfaceProvider https://chromium-review.googlesource.com/c/chromium/src/+/2546146 * Actually apply nan patch * update patches * chore: bump chromium in DEPS to 6718d4b50c9db975c5642ca5b68e8dc7ee1b7615 * update patches * 2546146: Remove browser-hosted InterfaceProvider https://chromium-review.googlesource.com/c/chromium/src/+/2546146 * chore: bump chromium in DEPS to 338cc300e3fe3a4cb4883e9ccdc34a32f3dfe034 * chore: bump chromium in DEPS to d9baeb1d192c23ceb1e1c4bbe6af98380b263bc1 * chore: bump chromium in DEPS to 3ca3051932683739b304e721cc394b6c66f841fe * chore: bump chromium in DEPS to 89292a4ae29096e5313aaf19dfa0c4710145c34d * 2571639: mac: Remove code to support OS X 10.10 in //sandbox https://chromium-review.googlesource.com/c/chromium/src/+/2571639 * Fixup patch indices * Do not build MTLManagedObjectAdapter It's been removed in newer Mantle versions and uses a deprecated enum * update patches * Remove sendToAll https://github.com/electron/electron/pull/26771 * 2569367: Remove dead fullscreen code in RenderWidgetHostView and friends https://chromium-review.googlesource.com/c/chromium/src/+/2569367 * Remove deprecated performFileOperation usage * 2568359: mac: Ignore Wdeprecated-declarations for LSSharedFileList* functions. https://chromium-review.googlesource.com/c/chromium/src/+/2568359 * 2561401: Add OutputPresenterX11 which uses X11 present extension. https://chromium-review.googlesource.com/c/chromium/src/+/2561401 * 2565511: [objects] Remove MakeExternal case for uncached internal strings https://chromium-review.googlesource.com/c/v8/v8/+/2565511 * fixup: Add disconnect logic to ElectronBrowserHandlerImpl * Allow local networking override for ATS https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CocoaKeys.html * Refactor: clean up rfh getters in ElectronBrowserHandlerImpl * Update patches * Remove unneeded BindTo * Don't assign ElectronBrowserHandlerImpl at all Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
147 lines
5.4 KiB
Diff
147 lines
5.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Apthorp <jeremya@chromium.org>
|
|
Date: Thu, 14 May 2020 16:52:09 -0700
|
|
Subject: crash: allow disabling compression on linux
|
|
|
|
This makes compression optional on breakpad_linux.
|
|
|
|
Upstream attempted here
|
|
https://chromium-review.googlesource.com/c/chromium/src/+/2198641, but
|
|
was denied.
|
|
|
|
Ultimately we should remove the option to disable compression, and
|
|
subsequently remove this patch.
|
|
|
|
diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
|
|
index 7b38b3bc102448b1c6f0663875ce305bc6e986ff..8f40e774bdb39b2e943e4ba56f012df0d4fd943d 100644
|
|
--- a/components/crash/core/app/breakpad_linux.cc
|
|
+++ b/components/crash/core/app/breakpad_linux.cc
|
|
@@ -109,6 +109,8 @@ void SetUploadURL(const std::string& url) {
|
|
DCHECK(!g_upload_url);
|
|
g_upload_url = strdup(url.c_str());
|
|
}
|
|
+
|
|
+bool g_compress_uploads = true;
|
|
#endif
|
|
|
|
bool g_is_node = false;
|
|
@@ -1320,56 +1322,60 @@ void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
|
|
|
|
#else // BUILDFLAG(IS_CHROMEOS_ASH)
|
|
|
|
- // Compress |dumpfile| with gzip.
|
|
- const pid_t gzip_child = sys_fork();
|
|
- if (gzip_child < 0) {
|
|
- static const char msg[] = "sys_fork() for gzip process failed.\n";
|
|
- WriteLog(msg, sizeof(msg) - 1);
|
|
- sys__exit(1);
|
|
- }
|
|
- if (!gzip_child) {
|
|
- // gzip process.
|
|
- const char* args[] = {
|
|
- "/bin/gzip",
|
|
- "-f", // Do not prompt to verify before overwriting.
|
|
- dumpfile,
|
|
- nullptr,
|
|
- };
|
|
- execve(args[0], const_cast<char**>(args), environ);
|
|
- static const char msg[] = "Cannot exec gzip.\n";
|
|
- WriteLog(msg, sizeof(msg) - 1);
|
|
- sys__exit(1);
|
|
- }
|
|
- // Wait for gzip process.
|
|
- int status = 0;
|
|
- if (sys_waitpid(gzip_child, &status, 0) != gzip_child ||
|
|
- !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
|
|
- static const char msg[] = "sys_waitpid() for gzip process failed.\n";
|
|
- WriteLog(msg, sizeof(msg) - 1);
|
|
- sys_kill(gzip_child, SIGKILL);
|
|
- sys__exit(1);
|
|
- }
|
|
+ if (g_compress_uploads) {
|
|
+ // Compress |dumpfile| with gzip.
|
|
+ const pid_t gzip_child = sys_fork();
|
|
+ if (gzip_child < 0) {
|
|
+ static const char msg[] = "sys_fork() for gzip process failed.\n";
|
|
+ WriteLog(msg, sizeof(msg) - 1);
|
|
+ sys__exit(1);
|
|
+ }
|
|
+ if (!gzip_child) {
|
|
+ // gzip process.
|
|
+ const char* args[] = {
|
|
+ "/bin/gzip",
|
|
+ "-f", // Do not prompt to verify before overwriting.
|
|
+ dumpfile,
|
|
+ nullptr,
|
|
+ };
|
|
+ execve(args[0], const_cast<char**>(args), environ);
|
|
+ static const char msg[] = "Cannot exec gzip.\n";
|
|
+ WriteLog(msg, sizeof(msg) - 1);
|
|
+ sys__exit(1);
|
|
+ }
|
|
+ // Wait for gzip process.
|
|
+ int status = 0;
|
|
+ if (sys_waitpid(gzip_child, &status, 0) != gzip_child ||
|
|
+ !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
|
|
+ static const char msg[] = "sys_waitpid() for gzip process failed.\n";
|
|
+ WriteLog(msg, sizeof(msg) - 1);
|
|
+ sys_kill(gzip_child, SIGKILL);
|
|
+ sys__exit(1);
|
|
+ }
|
|
|
|
- static const char kGzipExtension[] = ".gz";
|
|
- const size_t gzip_file_size = my_strlen(dumpfile) + sizeof(kGzipExtension);
|
|
- char* const gzip_file = reinterpret_cast<char*>(allocator->Alloc(
|
|
- gzip_file_size));
|
|
- my_strlcpy(gzip_file, dumpfile, gzip_file_size);
|
|
- my_strlcat(gzip_file, kGzipExtension, gzip_file_size);
|
|
+ static const char kGzipExtension[] = ".gz";
|
|
+ const size_t gzip_file_size = my_strlen(dumpfile) + sizeof(kGzipExtension);
|
|
+ char* const gzip_file =
|
|
+ reinterpret_cast<char*>(allocator->Alloc(gzip_file_size));
|
|
+ my_strlcpy(gzip_file, dumpfile, gzip_file_size);
|
|
+ my_strlcat(gzip_file, kGzipExtension, gzip_file_size);
|
|
|
|
- // Rename |gzip_file| to |dumpfile| (the original file was deleted by gzip).
|
|
- if (rename(gzip_file, dumpfile)) {
|
|
- static const char msg[] = "Failed to rename gzipped file.\n";
|
|
- WriteLog(msg, sizeof(msg) - 1);
|
|
- sys__exit(1);
|
|
+ // Rename |gzip_file| to |dumpfile| (the original file was deleted by gzip).
|
|
+ if (rename(gzip_file, dumpfile)) {
|
|
+ static const char msg[] = "Failed to rename gzipped file.\n";
|
|
+ WriteLog(msg, sizeof(msg) - 1);
|
|
+ sys__exit(1);
|
|
+ }
|
|
}
|
|
|
|
// The --header argument to wget looks like:
|
|
// --header=Content-Encoding: gzip
|
|
// --header=Content-Type: multipart/form-data; boundary=XYZ
|
|
// where the boundary has two fewer leading '-' chars
|
|
- static const char header_content_encoding[] =
|
|
+ static const char header_content_encoding_gzip[] =
|
|
"--header=Content-Encoding: gzip";
|
|
+ static const char header_content_encoding_identity[] =
|
|
+ "--header=Content-Encoding: identity";
|
|
static const char header_msg[] =
|
|
"--header=Content-Type: multipart/form-data; boundary=";
|
|
const size_t header_content_type_size =
|
|
@@ -1396,7 +1402,8 @@ void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
|
|
static const char kWgetBinary[] = "/usr/bin/wget";
|
|
const char* args[] = {
|
|
kWgetBinary,
|
|
- header_content_encoding,
|
|
+ g_compress_uploads ? header_content_encoding_gzip
|
|
+ : header_content_encoding_identity,
|
|
header_content_type,
|
|
post_file,
|
|
g_upload_url,
|
|
@@ -2037,6 +2044,7 @@ void InitCrashReporter(const std::string& process_type) {
|
|
|
|
#if !BUILDFLAG(IS_CHROMEOS_ASH)
|
|
SetUploadURL(GetCrashReporterClient()->GetUploadUrl());
|
|
+ g_compress_uploads = GetCrashReporterClient()->GetShouldCompressUploads();
|
|
#endif
|
|
|
|
if (is_browser_process) {
|