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

fix #2659 (regression)

This commit is contained in:
gorhill 2017-05-28 16:57:02 -04:00
parent 189c9d55dd
commit 1581ec20d8
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/chromium/manifest.json
View File

@ -2,7 +2,7 @@
"manifest_version": 2, "manifest_version": 2,
"name": "uBlock Origin", "name": "uBlock Origin",
"version": "1.12.5.14", "version": "1.12.5.15",
"commands": { "commands": {
"launch-element-zapper": { "launch-element-zapper": {

31
src/js/traffic.js
View File

@ -235,7 +235,7 @@ var onBeforeRootFrameRequest = function(details) {
// Check for specific block // Check for specific block
if ( result === 0 ) { if ( result === 0 ) {
result = snfe.matchStringExactType(context, requestURL, 'main_frame'); result = snfe.matchStringExactType(context, requestURL, 'main_frame');
if ( result !== 0 && logEnabled === true ) { if ( result !== 0 || logEnabled === true ) {
logData = snfe.toLogData(); logData = snfe.toLogData();
} }
} }
@ -243,21 +243,20 @@ var onBeforeRootFrameRequest = function(details) {
// Check for generic block // Check for generic block
if ( result === 0 ) { if ( result === 0 ) {
result = snfe.matchStringExactType(context, requestURL, 'no_type'); result = snfe.matchStringExactType(context, requestURL, 'no_type');
if ( result !== 0 ) { if ( result !== 0 || logEnabled === true ) {
if ( result === 1 || logEnabled === true ) { logData = snfe.toLogData();
logData = snfe.toLogData(); }
} // https://github.com/chrisaljoudi/uBlock/issues/1128
// https://github.com/chrisaljoudi/uBlock/issues/1128 // Do not block if the match begins after the hostname, except when
// Do not block if the match begins after the hostname, except when // the filter is specifically of type `other`.
// the filter is specifically of type `other`. // https://github.com/gorhill/uBlock/issues/490
// https://github.com/gorhill/uBlock/issues/490 // Removing this for the time being, will need a new, dedicated type.
// Removing this for the time being, will need a new, dedicated type. if (
if ( result === 1 &&
result === 1 && toBlockDocResult(requestURL, requestHostname, logData) === false
toBlockDocResult(requestURL, requestHostname, logData) === false ) {
) { result = 0;
result = 0; logData = undefined;
}
} }
} }