Bug 1206458 - Use LOAD_FLAGS_NONE unless shift-reload has been requested; r=margaret a=lizzard
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 01 Oct 2015 19:00:26 -0400
changeset 606985 01e92f8049ccc5abe2de2097688844aff37bb159
parent 606984 a393fc635accd7c3b4608b9f23638725b8602582
child 606986 369aac182bf6dc4a14d0921890e916f8fddee2a6
push id93006
push userjyavenard@mozilla.com
push dateThu, 15 Oct 2015 05:15:33 +0000
treeherdertry@45ea2a01301e [default view] [failures only]
reviewersmargaret, lizzard
bugs1206458
milestone43.0a2
Bug 1206458 - Use LOAD_FLAGS_NONE unless shift-reload has been requested; r=margaret a=lizzard
mobile/android/chrome/content/browser.js
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -1716,24 +1716,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 | Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE;
+        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) {