Remove fix to #3639

Related discussion: - uBlockOrigin/uAssets@a54cb2e#commitcomment-34387041 There no more spurious warning from the browser since Chromium 70, this was fixed in: https://bugs.chromium.org/p/chromium/issues/detail?id=111700#c42 Removing the special handling code means users of Chromium 69 and earlier will be back suffering the spurious warning, but both uBO and HTTPS-Everywhere function as intended.
gorhill · Jul 22, 2019 · df97249 · df97249 · uBlock-user · Jul 22, 2019
1 parent bb282d4
commit df97249
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/dist/version b/dist/version
@@ -1 +1 @@
-1.21.2
+1.21.4
diff --git a/src/js/redirect-engine.js b/src/js/redirect-engine.js
@@ -177,14 +177,6 @@ const mimeFromName = function(name) {
     }
 };
 
-// https://github.com/gorhill/uBlock/issues/3639
-// https://github.com/EFForg/https-everywhere/issues/14961
-// https://bugs.chromium.org/p/chromium/issues/detail?id=111700
-//   Do not redirect to a WAR if the platform suffers from spurious redirect
-//   conflicts, and the request to redirect is not `https:`.
-//   This special handling code can removed once the Chromium issue is fixed.
-const suffersSpuriousRedirectConflicts = vAPI.webextFlavor.soup.has('chromium');
-
 /******************************************************************************/
 /******************************************************************************/
 
@@ -206,11 +198,7 @@ RedirectEntry.prototype.toURL = function(fctxt) {
     if (
         this.warURL !== undefined &&
         fctxt instanceof Object &&
-        fctxt.type !== 'xmlhttprequest' &&
-        (
-            suffersSpuriousRedirectConflicts === false ||
-            fctxt.url.startsWith('https:')
-        )
+        fctxt.type !== 'xmlhttprequest'
     ) {
         return `${this.warURL}${vAPI.warSecret()}`;
     }