From 28132e774478bb632672ff04958b1cfc1a464da8 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Sun, 3 Jul 2022 09:04:13 -0400 Subject: v102.0 rc1 --- stop-undesired-requests.patch | 57 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 stop-undesired-requests.patch (limited to 'stop-undesired-requests.patch') diff --git a/stop-undesired-requests.patch b/stop-undesired-requests.patch new file mode 100644 index 0000000..79caa68 --- /dev/null +++ b/stop-undesired-requests.patch @@ -0,0 +1,57 @@ +diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js +index 34395476104e..83bc25d7fc62 100644 +--- a/browser/components/newtab/data/content/activity-stream.bundle.js ++++ b/browser/components/newtab/data/content/activity-stream.bundle.js +@@ -1577,7 +1577,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent { + label = /*#__PURE__*/external_React_default().createElement("span", null, "remote settings (", /*#__PURE__*/external_React_default().createElement("a", { + className: "providerUrl", + target: "_blank", +- href: "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records", ++ href: "https://see.ticket.about.this.invalid", + rel: "noopener noreferrer" + }, "nimbus-desktop-experiments"), ")"); + } +diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm +index 31ad77d28678..cca446b6fbde 100644 +--- a/services/settings/Utils.jsm ++++ b/services/settings/Utils.jsm +@@ -60,6 +60,10 @@ XPCOMUtils.defineLazyGetter(this, "isRunningTests", () => { + // Overriding the server URL is normally disabled on Beta and Release channels, + // except under some conditions. + XPCOMUtils.defineLazyGetter(this, "allowServerURLOverride", () => { ++ ++ // always allow this override for librewolf ++ return true; ++ + if (!AppConstants.RELEASE_OR_BETA) { + // Always allow to override the server URL on Nightly/DevEdition. + return true; +diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm +index 0bf60e5f163a..bcb685efe68d 100644 +--- a/toolkit/components/search/SearchUtils.jsm ++++ b/toolkit/components/search/SearchUtils.jsm +@@ -158,9 +158,9 @@ var SearchUtils = { + + ENGINES_URLS: { + "prod-main": +- "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/search-config/records", ++ "https://%.invalid", + "prod-preview": +- "https://firefox.settings.services.mozilla.com/v1/buckets/main-preview/collections/search-config/records", ++ "https://%.invalid", + "stage-main": + "https://settings.stage.mozaws.net/v1/buckets/main/collections/search-config/records", + "stage-preview": +diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm +index 7f8ac95dd962..334003b3e005 100644 +--- a/toolkit/modules/AppConstants.jsm ++++ b/toolkit/modules/AppConstants.jsm +@@ -422,7 +422,7 @@ this.AppConstants = Object.freeze({ + #ifdef MOZ_THUNDERBIRD + "https://thunderbird-settings.thunderbird.net/v1", + #else +- "https://firefox.settings.services.mozilla.com/v1", ++ "https://%.invalid", + #endif + + REMOTE_SETTINGS_VERIFY_SIGNATURE: -- cgit