Use proxy detection code path only on Firefox 79 and less

Related issue: - uBlockOrigin/uBlock-issues#911 This was fixed in Firefox 80: - https://bugzilla.mozilla.org/show_bug.cgi?id=1618271
gorhill · Oct 14, 2020 · 3059db7 · 3059db7
1 parent c227b8b
commit 3059db7
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/platform/firefox/vapi-webrequest.js b/platform/firefox/vapi-webrequest.js
@@ -125,19 +125,21 @@
             this.cnameFlushTime = Date.now() + this.cnameMaxTTL * 60000;
             // https://github.com/uBlockOrigin/uBlock-issues/issues/911
             //   Install/remove proxy detector.
-            const wrohr = browser.webRequest.onHeadersReceived;
-            if ( cnameUncloak === false || cnameUncloakProxied ) {
-                if ( wrohr.hasListener(proxyDetector) ) {
-                    wrohr.removeListener(proxyDetector);
+            if ( vAPI.webextFlavor.major < 80 ) {
+                const wrohr = browser.webRequest.onHeadersReceived;
+                if ( cnameUncloak === false || cnameUncloakProxied ) {
+                    if ( wrohr.hasListener(proxyDetector) ) {
+                        wrohr.removeListener(proxyDetector);
+                    }
+                } else if ( wrohr.hasListener(proxyDetector) === false ) {
+                    wrohr.addListener(
+                        proxyDetector,
+                        { urls: [ '*://*/*' ] },
+                        [ 'blocking' ]
+                    );
                 }
-            } else if ( wrohr.hasListener(proxyDetector) === false ) {
-                wrohr.addListener(
-                    proxyDetector,
-                    { urls: [ '*://*/*' ] },
-                    [ 'blocking' ]
-                );
+                proxyDetectorTryCount = 32;
             }
-            proxyDetectorTryCount = 32;
         }
         normalizeDetails(details) {
             if ( mustPunycode && !reAsciiHostname.test(details.url) ) {