Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use proxy detection code path only on Firefox 79 and less 

Related issue:
- https://github.com/uBlockOrigin/uBlock-issues/issues/911

This was fixed in Firefox 80:
- https://bugzilla.mozilla.org/show_bug.cgi?id=1618271
This commit is contained in:
Raymond Hill 2020-10-14 13:37:09 -04:00
parent c227b8bd0c
commit 3059db77c4
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
platform/firefox/vapi-webrequest.js
View File

@ -125,19 +125,21 @@
this.cnameFlushTime = Date.now() + this.cnameMaxTTL * 60000; this.cnameFlushTime = Date.now() + this.cnameMaxTTL * 60000;
// https://github.com/uBlockOrigin/uBlock-issues/issues/911 // https://github.com/uBlockOrigin/uBlock-issues/issues/911
// Install/remove proxy detector. // Install/remove proxy detector.
const wrohr = browser.webRequest.onHeadersReceived; if ( vAPI.webextFlavor.major < 80 ) {
if ( cnameUncloak === false || cnameUncloakProxied ) { const wrohr = browser.webRequest.onHeadersReceived;
if ( wrohr.hasListener(proxyDetector) ) { if ( cnameUncloak === false || cnameUncloakProxied ) {
wrohr.removeListener(proxyDetector); if ( wrohr.hasListener(proxyDetector) ) {
wrohr.removeListener(proxyDetector);
}
} else if ( wrohr.hasListener(proxyDetector) === false ) {
wrohr.addListener(
proxyDetector,
{ urls: [ '*://*/*' ] },
[ 'blocking' ]
);
} }
} else if ( wrohr.hasListener(proxyDetector) === false ) { proxyDetectorTryCount = 32;
wrohr.addListener(
proxyDetector,
{ urls: [ '*://*/*' ] },
[ 'blocking' ]
);
} }
proxyDetectorTryCount = 32;
} }
normalizeDetails(details) { normalizeDetails(details) {
if ( mustPunycode && !reAsciiHostname.test(details.url) ) { if ( mustPunycode && !reAsciiHostname.test(details.url) ) {