From cfb9884423faf741de03c5fcc72bf9ac8c6ada4d Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Tue, 7 Jun 2022 11:44:45 -0500 Subject: Revert "[Components:Addons] Guard against empty update manifest URL" This reverts commit 765406f5323117079d8d3de5b414f32c34757a9a. --- components/addons/src/AddonUpdateChecker.jsm | 8 -------- components/addons/src/XPIProvider.jsm | 6 +----- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/components/addons/src/AddonUpdateChecker.jsm b/components/addons/src/AddonUpdateChecker.jsm index 596ac9dd4..0001f921a 100644 --- a/components/addons/src/AddonUpdateChecker.jsm +++ b/components/addons/src/AddonUpdateChecker.jsm @@ -590,14 +590,6 @@ function UpdateParser(aId, aUpdateKey, aUrl, aObserver) { let requireBuiltIn = Services.prefs.getBoolPref(PREF_UPDATE_REQUIREBUILTINCERTS, true); logger.debug("Requesting " + aUrl); - - if (!aUrl) { - logger.warn("Request failed: empty update manifest URL"); - this._doneAt = new Error("UP_emptyManifestURL"); - this.notifyError(AddonUpdateChecker.ERROR_DOWNLOAD_ERROR); - return; - } - try { this.request = new ServiceRequest(); this.request.open("GET", this.url, true); diff --git a/components/addons/src/XPIProvider.jsm b/components/addons/src/XPIProvider.jsm index c5dcc7f9c..4d203b573 100644 --- a/components/addons/src/XPIProvider.jsm +++ b/components/addons/src/XPIProvider.jsm @@ -6098,11 +6098,7 @@ function UpdateChecker(aAddon, aListener, aReason, aAppVersion, aPlatformVersion if ("onUpdateAvailable" in this.listener) aReason |= UPDATE_TYPE_NEWVERSION; - // Don't perform substitutions on the update URL if we still don't - // have one at this point. - let url = updateURL ? - escapeAddonURI(aAddon, url, aReason, aAppVersion) : - updateURL; + let url = escapeAddonURI(aAddon, updateURL, aReason, aAppVersion); this._parser = AddonUpdateChecker.checkForUpdates(aAddon.id, aAddon.updateKey, url, this); } -- cgit v1.2.3