From df972497156e04d451940626988c2c115f924f26 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Mon, 22 Jul 2019 06:13:58 -0400
Subject: [PATCH] Remove fix to https://github.com/gorhill/uBlock/issues/3639

Related discussion:
- https://github.com/uBlockOrigin/uAssets/commit/a54cb2e38f7b2af972f2ddee8fd86350d6f2e07c#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.
---
 dist/version              |  2 +-
 src/js/redirect-engine.js | 14 +-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/dist/version b/dist/version
index 0369d0b1e..20a1265cf 100644
--- 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
index 9368c8127..b6c4b6e2b 100644
--- 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()}`;
     }