Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-09-19 17:31:45 +02:00
Code Issues Releases Wiki Activity

Fix list lookup of multi-hostname domain= filters in logger

Browse Source 
Related commit:
- 3f3a1543ea

The regression was preventing uBO to find from which list a filter
originated. This affected only filters for which the `domain=`
option had multiple hostnames.
This commit is contained in:
Raymond Hill 2019-04-27 07:04:43 -04:00
parent 761a0ef27c
commit a8946c8d73
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/js/static-net-filtering.js
View File

@ -946,11 +946,9 @@ const filterOrigin = new (class {
return FilterOriginMixedSet.compile(domainOpt, wrapped); return FilterOriginMixedSet.compile(domainOpt, wrapped);
} }
logData(f, arg1, arg2) { logData(out, domainOpt) {
const out = f.wrapped.logData();
out.compiled = [ f.fid, arg1, out.compiled ];
if ( out.opts !== undefined ) { out.opts += ','; } if ( out.opts !== undefined ) { out.opts += ','; }
out.opts = `domain=${arg2 || arg1}`; out.opts = `domain=${domainOpt}`;
return out; return out;
} }
@ -1000,7 +998,9 @@ const FilterOriginHit = class {
} }
logData() { logData() {
return filterOrigin.logData(this, this.hostname); const out = this.wrapped.logData();
out.compiled = [ this.fid, this.hostname, out.compiled ];
return filterOrigin.logData(out, this.hostname);
} }
compile() { compile() {
@ -1041,7 +1041,9 @@ const FilterOriginMiss = class {
} }
logData() { logData() {
return filterOrigin.logData(this, this.hostname, `~${this.hostname}`); const out = this.wrapped.logData();
out.compiled = [ this.fid, this.hostname, out.compiled ];
return filterOrigin.logData(out, `~${this.hostname}`);
} }
compile() { compile() {
@ -1086,7 +1088,9 @@ const FilterOriginHitSet = class {
} }
logData() { logData() {
return filterOrigin.logData(this, this.domainOpt); const out = this.wrapped.logData();
out.compiled = [ this.fid, this.domainOpt, null, out.compiled ];
return filterOrigin.logData(out, this.domainOpt);
} }
compile() { compile() {
@ -1139,7 +1143,9 @@ const FilterOriginMissSet = class {
} }
logData() { logData() {
return filterOrigin.logData(this, this.domainOpt); const out = this.wrapped.logData();
out.compiled = [ this.fid, this.domainOpt, null, out.compiled ];
return filterOrigin.logData(out, this.domainOpt);
} }
compile() { compile() {
@ -1206,7 +1212,9 @@ const FilterOriginMixedSet = class {
} }
logData() { logData() {
return filterOrigin.logData(this, this.domainOpt); const out = this.wrapped.logData();
out.compiled = [ this.fid, this.domainOpt, null, null, out.compiled ];
return filterOrigin.logData(out, this.domainOpt);
} }
compile() { compile() {