Bug 1195976. r=bnicholson, a=sledru
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Thu, 27 Aug 2015 13:20:47 +0100
changeset 289028 753d9e05c8e820c4e91ba2373a321012b27c54ef
parent 289027 63e48f89ff5caca7c4f99d6909d16038f5ac0cea
child 289029 11599331105a89e0fa34a9d92bf9b6c2c07bb432
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbnicholson, sledru
bugs1195976
milestone42.0a2
Bug 1195976. r=bnicholson, a=sledru
toolkit/components/reader/ReaderMode.jsm
--- a/toolkit/components/reader/ReaderMode.jsm
+++ b/toolkit/components/reader/ReaderMode.jsm
@@ -223,16 +223,22 @@ this.ReaderMode = {
                 return;
               }
               // Otherwise, pass an object indicating our new URL:
               reject({newURL: url});
               return;
             }
           }
         }
+        if (xhr.responseURL != url) {
+          // We were redirected without a meta refresh tag.
+          // Force redirect to the correct place:
+          reject({newURL: xhr.responseURL});
+          return;
+        }
         resolve(doc);
         histogram.add(DOWNLOAD_SUCCESS);
       }
       xhr.send();
     });
   },