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

Mind that Firefox 59 and less does not support `browser.dns`

This commit is contained in:
Raymond Hill 2019-12-08 11:08:04 -05:00
parent 1364e4836e
commit 832ebd360e
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,11 +68,12 @@
this.cnameMaxTTL = 60; this.cnameMaxTTL = 60;
this.cnameReplayFullURL = false; this.cnameReplayFullURL = false;
this.cnameTimer = undefined; this.cnameTimer = undefined;
this.cnameUncloak = true; this.cnameUncloak = browser.dns instanceof Object;
} }
setOptions(options) { setOptions(options) {
super.setOptions(options); super.setOptions(options);
this.cnameUncloak = options.cnameUncloak !== false; this.cnameUncloak = browser.dns instanceof Object &&
options.cnameUncloak !== false;
this.cnameIgnoreList = this.regexFromStrList(options.cnameIgnoreList); this.cnameIgnoreList = this.regexFromStrList(options.cnameIgnoreList);
this.cnameIgnore1stParty = options.cnameIgnore1stParty !== false; this.cnameIgnore1stParty = options.cnameIgnore1stParty !== false;
this.cnameIgnoreExceptions = options.cnameIgnoreExceptions !== false; this.cnameIgnoreExceptions = options.cnameIgnoreExceptions !== false;
@ -202,6 +203,7 @@
} }
onBeforeSuspendableRequest(details) { onBeforeSuspendableRequest(details) {
const r = super.onBeforeSuspendableRequest(details); const r = super.onBeforeSuspendableRequest(details);
if ( this.cnameUncloak === false ) { return r; }
if ( r !== undefined ) { if ( r !== undefined ) {
if ( if (
r.cancel === true || r.cancel === true ||
@ -217,7 +219,6 @@
) { ) {
return; return;
} }
if ( this.cnameUncloak === false ) { return; }
const hn = vAPI.hostnameFromNetworkURL(details.url); const hn = vAPI.hostnameFromNetworkURL(details.url);
const cname = this.cnames.get(hn); const cname = this.cnames.get(hn);
if ( cname === '' ) { return; } if ( cname === '' ) { return; }