From 47cfba1551b8335a8d2dacc8426744443bc84e31 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Mon, 22 Jul 2019 06:30:00 -0400
Subject: [PATCH] Manually import df972497156e from 1.21.4

Related commit:
- https://github.com/gorhill/uBlock/commit/df972497156e
---
 src/js/redirect-engine.js | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/js/redirect-engine.js b/src/js/redirect-engine.js
index 01cdf03b1..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()}`;
     }