8798571a77
* chore: bump chromium in DEPS to 1f1c4d91f6eaa4a033ec8f499d63a0717f79a42a * viz: Do not apply white level scaling for RGBA fp16 HDR video https://chromium-review.googlesource.com/c/chromium/src/+/2296006 * Move WebPreferences to WebContents https://chromium-review.googlesource.com/c/chromium/src/+/2263635 * Fix missing WeakPtr check in PreconnectManager https://chromium-review.googlesource.com/c/chromium/src/+/2309029 * Fixup swiftshader roll revision * Update patch indices * Move WebDeviceEmulationParams into common. https://chromium-review.googlesource.com/c/chromium/src/+/2303356 * Move EnableDisableDeviceEmulation to blink mojom messages https://chromium-review.googlesource.com/c/chromium/src/+/2303367 * PDF Viewer: Remove flag for two-up view https://chromium-review.googlesource.com/c/chromium/src/+/2311130 * Add mojom definition for DeviceEmulationParams. https://chromium-review.googlesource.com/c/chromium/src/+/2303491 * Remove ServiceWorkerContextWatcher from PaymentAppInstaller https://chromium-review.googlesource.com/c/chromium/src/+/2291186 * Loader: Move transferrable_url_loader.mojom into blink's mojom directory https://chromium-review.googlesource.com/c/chromium/src/+/2306123 * chore: bump chromium in DEPS to 4974f436479739025a90ebc2cc2e36d67ee1ac46 * mac: Work around Xcode 12b3 SDK bug https://chromium-review.googlesource.com/c/chromium/src/+/2315078 * Reland Update core items for macOS Big Sur. https://chromium-review.googlesource.com/c/chromium/src/+/2315162 * Update Swiftshader revision * mac/arm64: When cross-building the snapshot, use page size of the target ISA instead of the host. https://chromium-review.googlesource.com/c/v8/v8/+/2310575 * Update patch indices * Rename {,Non}ClientView::CanClose() to OnWindowCloseRequested() https://chromium-review.googlesource.com/c/chromium/src/+/2247838 * chore: bump chromium in DEPS to e9465d70d1dea539400f0fddad43358ea3c31d71 * chore: bump chromium in DEPS to bd5b71c5f20288eb26068a39ae6e0579566a51c5 * chore: bump chromium in DEPS to 786ee543048bd07d07c5ac50b7dbbdd6bdd8dcce * chore: bump chromium in DEPS to 34eb6ecbf2c5894b648900bf771a2a29de204798 * chore: bump chromium in DEPS to 567ff038d68e3adb8116a01eec863cdf34d775f5 * chore: bump chromium in DEPS to 340b45c8d4ceb2dd61969fc34e1928d3c46db48c * chore: update patches * chore: base::DeleteFile with two params is removed Should use base::DeleteFile and base::DeletePathRecursively when appropriate Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2313376 * chore: add patch for NodePlatform::PostJob impl * chore: update patches * chore: extension file access is now instrumented Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2209995 * chore: implement SetWindowFrameInScreen in OSR RWHV Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2321409 * chore: NotifyUserActivation requires a type now This is just for a histogram thing and therefore it does not matter what we pass in Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2281303 * chore: update patches * chore: bump chromium in DEPS to cd570e6dd3dcb84463ac252b04e92ceb02d8400c * chore: update patches * chore: bump chromium in DEPS to 0187908a31866992b90c59719ac1d016328f6ee0 * chore: bump chromium in DEPS to 3c9df38c508f3dba26a75248beed4882ddfb98e9 * chore: bump chromium in DEPS to 1a47d3b9cee710bd3c958c4f2d8b205710df9d50 * chore: bump chromium in DEPS to baac93040d96abdab72d46dd034c60f86e108702 * chore: bump chromium in DEPS to 13836145f97299e636491de38064b78861c4fb2e * update patches * change OS_MACOSX -> OS_MAC Refs: https://bugs.chromium.org/p/chromium/issues/detail?id=1105907 * patch: add header for ToExecutionContext in WebMessagePortConverter * chore: bump chromium in DEPS to 91ab9b6ac5d04dc034a03ad847fbfa8261328c2b * update patches * NeedToFireBeforeUnloadOrUnload -> NeedToFireBeforeUnloadOrUnloadEvents Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2288711 * chore: bump chromium in DEPS to 290deb11f0e30cb1382fd8f8793d340560283c23 * update patches * add dragdrop header for autofill popup * int -> x11::Time * patch out accessibility private API use Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2330812 * remove usage of XEvent Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2317767 * trigger recalculation of WebPreferences before renderer initialization Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2263635 * chore: bump chromium in DEPS to 6bdb484583b99c96ef3388d0c2184326581b2d5a * chore: bump chromium in DEPS to 1eb2a79cde04fd5c8ae51b4d813e6521635269e5 * chore: bump chromium in DEPS to 3dc8e3c0f400e4ca9c0a63d7a39bd910997ad4c6 * chore: update patches * fixup! trigger recalculation of WebPreferences before renderer initialization * views: Make MenuButton and RadioButton default constructible https://chromium-review.googlesource.com/c/chromium/src/+/2339586 * chore: fix code style Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Samuel Attard <sattard@slack-corp.com> Co-authored-by: Andy Locascio <andy@slack-corp.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 fdd76ee1490e39dbfcd39bbff6686864a5c5af29..4e717ba90066bc75bf173b5027100a05cc1c8749 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 // defined(OS_CHROMEOS)
|
|
|
|
- // 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 !defined(OS_CHROMEOS)
|
|
SetUploadURL(GetCrashReporterClient()->GetUploadUrl());
|
|
+ g_compress_uploads = GetCrashReporterClient()->GetShouldCompressUploads();
|
|
#endif
|
|
|
|
if (is_browser_process) {
|