Issue 7312 - Ignore lone pure generic filters for specific-only queries

test/matcher.js

Index: test/matcher.js
===================================================================
--- a/test/matcher.js
+++ b/test/matcher.js
@@ -240,16 +240,20 @@
   checkMatch(test, ["/bar", "@@||foo.com^"], "http://foo.com/foo", "IMAGE", "foo.com", false, null, false, null, "@@||foo.com^");
   checkMatch(test, ["||foo.com^$popup"], "http://foo.com/bar", "POPUP", "foo.com", false, null, false, "||foo.com^$popup");
   checkMatch(test, ["@@||foo.com^$popup"], "http://foo.com/bar", "POPUP", "foo.com", false, null, false, null, "@@||foo.com^$popup");
   checkMatch(test, ["||foo.com^$popup", "@@||foo.com^$popup"], "http://foo.com/bar", "POPUP", "foo.com", false, null, false, "@@||foo.com^$popup", "||foo.com^$popup");
   checkMatch(test, ["||foo.com^$csp=script-src 'none'"], "http://foo.com/bar", "CSP", "foo.com", false, null, false, "||foo.com^$csp=script-src 'none'");
   checkMatch(test, ["@@||foo.com^$csp"], "http://foo.com/bar", "CSP", "foo.com", false, null, false, null, "@@||foo.com^$csp");
   checkMatch(test, ["||foo.com^$csp=script-src 'none'", "@@||foo.com^$csp"], "http://foo.com/bar", "CSP", "foo.com", false, null, false, "@@||foo.com^$csp", "||foo.com^$csp=script-src 'none'");
 
+  // See #7312.
+  checkMatch(test, ["^foo/bar/$script"], "http://foo/bar/", "SCRIPT", "example.com", true, null, true, null);

[Manish Jethani, 2019/02/26 11:54:24]

There's a domain-specific blocking filter and a generic whitelist filter.
Matcher should return the first match regardless of the filter type (as decided
in changeset df4fb2d41cbf). CombinedMatcher should return the whitelist filter,
even with the specific-only flag set, because there is a blocking filter that
matches.

+  checkMatch(test, ["^foo/bar/$script,domain=example.com", "@@^foo/bar/$script"], "http://foo/bar/", "SCRIPT", "example.com", true, null, true, "@@^foo/bar/$script", "^foo/bar/$script,domain=example.com");
+
   test.done();
 };
 
 exports.testFilterSearch = function(test)
 {
   // Start with three filters: foo, bar, and @@foo
   let filters = ["foo", "bar", "@@foo"];