diff options
| author | Moonchild <moonchild@palemoon.org> | 2022-06-07 11:58:39 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-06-07 11:59:07 +0000 |
| commit | cfc0eeca53dac4b865a933954f9af44328efba5b (patch) | |
| tree | 6bba6c521c2c8bb0c8854f08020ae50681467d0c | |
| parent | ebd3dd9228e9308ab4414a92ed9e27e4f4ade5d9 (diff) | |
| download | uxp-RB_20220607_2.tar.gz | |
Revert "Issue #1909 - Guard against empty update manifest URL"RB_20220607_2
This reverts commit d7fadcdef94399e14ad9ad8318ebc7131b78a75a.
| -rw-r--r-- | toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm | 8 | ||||
| -rw-r--r-- | toolkit/mozapps/extensions/internal/XPIProvider.jsm | 6 |
2 files changed, 1 insertions, 13 deletions
diff --git a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm index 7eb8c9b9d5..0dfb7cd109 100644 --- a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm +++ b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm @@ -611,14 +611,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/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index d266ab6fac..dbb1a18dd1 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -6129,11 +6129,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); } |