From ef9913c7119e624d74627db4b07d9454108ce25d Mon Sep 17 00:00:00 2001 From: gorhill Date: Wed, 8 Apr 2015 07:04:29 -0400 Subject: [PATCH] this fixes https://github.com/chrisaljoudi/uBlock/issues/1212 --- src/js/traffic.js | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/js/traffic.js b/src/js/traffic.js index 50c200421..5802a367a 100644 --- a/src/js/traffic.js +++ b/src/js/traffic.js @@ -252,13 +252,6 @@ var toBlockDocResult = function(url, hostname, result) { return ''; } - // Quick test: if the result starts with `|` or `||`, then this means the - // match is before the path part of the URL for sure. - // Examples: sb:|http:// sb:||example.com^ - if ( result.charAt(3) === '|' ) { - return result; - } - // Make a regex out of the result var reText = result.slice(3); var pos = reText.indexOf('$'); @@ -266,11 +259,6 @@ var toBlockDocResult = function(url, hostname, result) { reText = reText.slice(0, pos); } - // Matches whole URL - if ( reText === '*' ) { - return result; - } - // We are going to have to take the long way to find out if ( reText.charAt(0) === '/' && reText.slice(-1) === '/' ) { reText = reText.slice(1, -1); @@ -291,8 +279,10 @@ var toBlockDocResult = function(url, hostname, result) { return ''; } - // verify that the match starts before the path - if ( matches.index < url.indexOf(hostname) + hostname.length ) { + // https://github.com/chrisaljoudi/uBlock/issues/1128 + // https://github.com/chrisaljoudi/uBlock/issues/1212 + // Relax the rule: verify that the match is completely before the path part + if ( re.lastIndex <= url.indexOf(hostname) + hostname.length + 1 ) { return result; }