28ada6ea8b
* chore: bump chromium in DEPS to 99.0.4819.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4824.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4827.0
* chore: update patches
* 3352511: PiP: Add inkdrop and pointer cursor to PiP window buttons
https://chromium-review.googlesource.com/c/chromium/src/+/3352511
* 3309164: webhid: Show FIDO devices in the chooser if allowed
https://chromium-review.googlesource.com/c/chromium/src/+/3309164
* 3297868: hid: Add experimental HIDDevice.forget()
https://chromium-review.googlesource.com/c/chromium/src/+/3297868
* 3362491: [Extensions] Move i18n API to //extensions
https://chromium-review.googlesource.com/c/chromium/src/+/3362491
* MCC Refactor step0: Allow embedders to register associated_interface binders with RenderFrameHostImpl::associated_registry_.
https://chromium-review.googlesource.com/c/chromium/src/+/3281481
* 3352616: [Gtk] Remove libgtk from the link-line
https://chromium-review.googlesource.com/c/chromium/src/+/3352616
* 3249211: Clear-Site-Data support for partitioned cookies
https://chromium-review.googlesource.com/c/chromium/src/+/3249211
* [Extensions][COIL] Use [allow|block]list in //extensions/common
https://chromium-review.googlesource.com/c/chromium/src/+/3372668
* Begin ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3376154
* [Code Health] Refactor PrefService GetDict + GetList to use base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3343526
* 3354997: [CodeHealth] Remove deprecated SetDictionary method
https://chromium-review.googlesource.com/c/chromium/src/+/3354997
* 3287323: Add LacrosPrefStore for lacros settings
https://chromium-review.googlesource.com/c/chromium/src/+/3287323
* 3365916: [PA] Clean up remaining lazy commit code
https://chromium-review.googlesource.com/c/chromium/src/+/3365916
* [MPArch] Target the external protocol error at the responsible frame.
https://chromium-review.googlesource.com/c/chromium/src/+/3011560
* Pass origin to RegisterNonNetworkSubresourceURLLoaderFactories
https://chromium-review.googlesource.com/c/chromium/src/+/3350608
* Linux: Send OSCrypt raw encryption key to the Network Service
https://chromium-review.googlesource.com/c/chromium/src/+/3320484
* [PlzServiceWorker] Remove remaining references to PlzServiceWorker.
https://chromium-review.googlesource.com/c/chromium/src/+/3359441
* chore: fixup for lint
* 3327621: Fix tablet mode detection for Win 11.
https://chromium-review.googlesource.com/c/chromium/src/+/3327621
* 3342428: ax_mac: move AXTextMarker conversion utils under ui umbrella
https://chromium-review.googlesource.com/c/chromium/src/+/3342428
* 3353974: Mac: Use base::Feature for overlay features
https://chromium-review.googlesource.com/c/chromium/src/+/3353974
* chore: bump chromium in DEPS to 99.0.4828.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4837.0
* chore: update patches
* chore: update patches
* 3379142: Drop FALLTHROUGH macro
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3379142
* 3381749: C++17: Allow use of std::map::try_emplace and std::map::insert_or_assign
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3381749
* chore: bump chromium in DEPS to 99.0.4839.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4840.0
* chore: bump chromium in DEPS to 99.0.4844.0
* 3395881: [api] Deprecate Local<v8::Context> v8::Object::CreationContext()
Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3395881
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4845.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4847.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4849.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4851.0
* chore: bump chromium in DEPS to 100.0.4853.0
* update patches
* chore: update patches
* update patches
* 3383599: Fonts Access: Remove prototype that uses a font picker.
https://chromium-review.googlesource.com/c/chromium/src/+/3383599
* 3404768: Remove ALLOW_UNUSED macros
https://chromium-review.googlesource.com/c/chromium/src/+/3404768
* 3374762: Remove ignore_result.h
https://chromium-review.googlesource.com/c/chromium/src/+/3374762
* 3399305: [unseasoned-pdf] Apply proper frame offsets for touch selections
https://chromium-review.googlesource.com/c/chromium/src/+/3399305
* 3402210: [Extensions] Don't trigger unload event for already unloaded extension
https://chromium-review.googlesource.com/c/chromium/src/+/3402210
* 3410912: Combine URLLoaderClient OnReceiveResponse and OnStartLoadingResponseBody.
https://chromium-review.googlesource.com/c/chromium/src/+/3410912
* 3370428: Make the AuthSchemes policy support dynamic refresh
https://chromium-review.googlesource.com/c/chromium/src/+/3370428
* 3407603: Finish ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3407603
* 3378352: ozone/x11: move code from //ui/p/x11 to //ui/ozone/p/x11
https://chromium-review.googlesource.com/c/chromium/src/+/3378352
* 3370810: Delete chrome/service, AKA the Cloud Print service process.
https://chromium-review.googlesource.com/c/chromium/src/+/3370810
* chore: bump chromium in DEPS to 100.0.4855.0
* chore: update patches
* fixup! 3370810: Delete chrome/service, AKA the Cloud Print service process.
* revert 3348007 to fix windows build
* 3318572: [Code health] Fix gn check errors in //extensions/browser:*
https://chromium-review.googlesource.com/c/chromium/src/+/3318572
* fix printing.patch
* fix iwyu issue
* 3408515: win: Make ShorcutOperation an enum class and modernize names
https://chromium-review.googlesource.com/c/chromium/src/+/3408515
* 3388333: [UIA] Remove dead code accessibility_misc_utils.h/cc
https://chromium-review.googlesource.com/c/chromium/src/+/3388333
* fix windows build? i hope
* patch gn visibility of //ui/ozone/platform/x11
* missing include base/logging.h
* use BUILDFLAG for USE_NSS_CERTS
https://chromium-review.googlesource.com/c/chromium/src/+/3379123
* defined(OS_*) ==> BUILDFLAG(IS_*)
https://bugs.chromium.org/p/chromium/issues/detail?id=1234043
* fixup! 3404768: Remove ALLOW_UNUSED macros
* another attempt to fix windows build
* temporarily disable the custom scheme service worker test
https://github.com/electron/electron/issues/32664
* fix loading mv3 extensions
not sure what cl broke this unfort.
* fixup! 3404768: Remove ALLOW_UNUSED macros
* patch nan
https://chromium-review.googlesource.com/c/v8/v8/+/3395880
* fix node test
* fix nullptr in FindPdfFrame
* patch perfetto to fix build issue on win-ia32
bc44c3c753
* fix build for linux-x64-testing-no-run-as-node
* fix patch
* skip <webview>.capturePage() test
https://github.com/electron/electron/issues/32705
* test: fix failing tests of focus/blur events of WebContents (#32711)
* inherit stdio from app module test child processes
this prevents them from timing out due to full stdout buffers
* test to see if we can get better logs on windows ci
* try again for appveyor log things
* skip contentTracing tests on ia32
* ci: disable gpu compositing
* drop applied patch
* fix merge fail
* Revert "ci: disable gpu compositing"
This reverts commit 0344129fcb19ea3e87e06c1110d751f22eba3fec.
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
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 8df14f416ee321e1259433715a61fa6025207d80..1d7f38d3f89d9c7f110cc9eb880264464787eb32 100644
|
|
--- a/components/crash/core/app/breakpad_linux.cc
|
|
+++ b/components/crash/core/app/breakpad_linux.cc
|
|
@@ -110,6 +110,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;
|
|
@@ -1322,56 +1324,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 =
|
|
@@ -1398,7 +1404,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,
|
|
@@ -2039,6 +2046,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) {
|