diff options
Diffstat (limited to 'toolkit/modules/addons/WebRequest.jsm')
| -rw-r--r-- | toolkit/modules/addons/WebRequest.jsm | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/toolkit/modules/addons/WebRequest.jsm b/toolkit/modules/addons/WebRequest.jsm index c720dae5d..26118e43f 100644 --- a/toolkit/modules/addons/WebRequest.jsm +++ b/toolkit/modules/addons/WebRequest.jsm @@ -19,8 +19,6 @@ Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Task.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "AppConstants", - "resource://gre/modules/AppConstants.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "BrowserUtils", "resource://gre/modules/BrowserUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "ExtensionUtils", @@ -720,11 +718,7 @@ HttpObserverManager = { try { let result = callback(data); - if (result && typeof result === "object" && opts.blocking - && !AddonManagerPermissions.isHostPermitted(uri.host) - && (!loadInfo || !loadInfo.loadingPrincipal - || !loadInfo.loadingPrincipal.URI - || !AddonManagerPermissions.isHostPermitted(loadInfo.loadingPrincipal.URI.host))) { + if (result && typeof result === "object" && opts.blocking) { handlerResults.push({opts, result}); } } catch (e) { @@ -846,9 +840,9 @@ var onBeforeRequest = { get allowedOptions() { delete this.allowedOptions; this.allowedOptions = ["blocking"]; - if (!AppConstants.RELEASE_OR_BETA) { - this.allowedOptions.push("requestBody"); - } +#ifndef RELEASE_OR_BETA + this.allowedOptions.push("requestBody"); +#endif return this.allowedOptions; }, addListener(callback, filter = null, opt_extraInfoSpec = null) { |