Bug 1206458 - Use LOAD_FLAGS_NONE unless shift-reload has been requested; r=margaret
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 01 Oct 2015 19:00:26 -0400
changeset 266741 8c3b3ff674485ea841cecb58d63159d1c6d81c0d
parent 266740 d9a3376464dc0b74ef914772b90df25ec7de99e3
child 266742 30c52fc05c80926d79018866eb78b73f9727ffda
push id29497
push usercbook@mozilla.com
push dateThu, 08 Oct 2015 13:27:17 +0000
treeherdermozilla-central@1f4cf75c8948 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmargaret
bugs1206458
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1206458 - Use LOAD_FLAGS_NONE unless shift-reload has been requested; r=margaret
mobile/android/chrome/content/browser.js
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -1763,24 +1763,25 @@ var BrowserApp = {
             Log.e("Browser", "Incorrect index " + index + " truncated to " + historySize - 1);
             index = historySize - 1;
           }
 
           browser.gotoIndex(index);
           break;
 
       case "Session:Reload": {
-        let flags = Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_PROXY;
+        let flags = Ci.nsIWebNavigation.LOAD_FLAGS_NONE;
 
         // Check to see if this is a message to enable/disable mixed content blocking.
         if (aData) {
           let data = JSON.parse(aData);
 
           if (data.bypassCache) {
-            flags |= Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE;
+            flags |= Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE |
+                     Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_PROXY;
           }
 
           if (data.contentType === "tracking") {
             // Convert document URI into the format used by
             // nsChannelClassifier::ShouldEnableTrackingProtection
             // (any scheme turned into https is correct)
             let normalizedUrl = Services.io.newURI("https://" + browser.currentURI.hostPort, null, null);
             if (data.allowContent) {