Bug 1277698, r=bz, a=al
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Tue, 07 Jun 2016 14:47:35 +0100
changeset 333328 da4a9eed33bdbc5f5bd1002cc07f998a1eb037fa
parent 333327 58590eb627383ea4df6dcbef985adefcac0dae91
child 333331 331c922bff8152bc967e9065a97566f9f712e434
push id6065
push usercbook@mozilla.com
push dateWed, 15 Jun 2016 22:13:21 +0000
treeherdermozilla-beta@da4a9eed33bd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz, al
bugs1277698
milestone48.0
Bug 1277698, r=bz, a=al MozReview-Commit-ID: JH5QUu357gc
browser/components/feeds/FeedConverter.js
--- a/browser/components/feeds/FeedConverter.js
+++ b/browser/components/feeds/FeedConverter.js
@@ -483,17 +483,23 @@ GenericProtocolHandler.prototype = {
     this._scheme = scheme;
   },
 
   get scheme() {
     return this._scheme;
   },
 
   get protocolFlags() {
-    return this._http.protocolFlags;
+    if (Services.prefs.getPrefType("browser.feeds.feeds_like_http") &&
+        Services.prefs.getBoolPref("browser.feeds.feeds_like_http")) {
+      return this._http.protocolFlags;
+    }
+    let {URI_DANGEROUS_TO_LOAD, ALLOWS_PROXY_HTTP, ALLOWS_PROXY} =
+      Ci.nsIProtocolHandler;
+    return URI_DANGEROUS_TO_LOAD | ALLOWS_PROXY | ALLOWS_PROXY_HTTP;
   },
 
   get defaultPort() {
     return this._http.defaultPort;
   },
 
   allowPort(port, scheme) {
     return this._http.allowPort(port, scheme);