diff options
| author | Moonchild <moonchild@palemoon.org> | 2022-02-04 01:44:41 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-04-19 17:38:02 +0000 |
| commit | 185a027640f9b18c97eda39a49bfa2dcce58fcdb (patch) | |
| tree | d29b146d37f0f831ec981316da778c91fd77be8a /toolkit | |
| parent | 99ec088ecf1259643f6124206af024de3ebc49ad (diff) | |
| download | uxp-185a027640f9b18c97eda39a49bfa2dcce58fcdb.tar.gz | |
Issue #1877 - Resolve RELEASE_OR_BETA conditionals.
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/modules/addons/WebRequest.jsm | 5 | ||||
| -rw-r--r-- | toolkit/xre/nsAppRunner.cpp | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/toolkit/modules/addons/WebRequest.jsm b/toolkit/modules/addons/WebRequest.jsm index 26118e43f9..b9f9e7b652 100644 --- a/toolkit/modules/addons/WebRequest.jsm +++ b/toolkit/modules/addons/WebRequest.jsm @@ -839,10 +839,7 @@ HttpObserverManager = { var onBeforeRequest = { get allowedOptions() { delete this.allowedOptions; - this.allowedOptions = ["blocking"]; -#ifndef RELEASE_OR_BETA - this.allowedOptions.push("requestBody"); -#endif + this.allowedOptions = ["blocking", "requestBody"]; return this.allowedOptions; }, addListener(callback, filter = null, opt_extraInfoSpec = null) { diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 932325458e..b15335ade3 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -921,11 +921,8 @@ nsXULAppInfo::GetLastRunCrashID(nsAString &aLastRunCrashID) NS_IMETHODIMP nsXULAppInfo::GetIsReleaseOrBeta(bool* aResult) { -#ifdef RELEASE_OR_BETA + // Unused; always returns true. *aResult = true; -#else - *aResult = false; -#endif return NS_OK; } |