Merge branch 'v0.9.5.3'

* v0.9.5.3: 1. Special handling is given to filters which had to match against document origin only. The filter will only be considered if it satisfies the given criteria. - Should be in the form of `/czf*.` (without token) or `|https://` or `|http://` or `*` - Should have `domain=` option - Should not have a negated domain in its `domain=` option - Should not have `csp=` option examples: |http://$image,script,subdocument,third-party,xmlhttprequest,domain=dwindly.io |https://$image,other,script,stylesheet,third-party,domain=movies123.xyz $websocket,domain=povw1deo.com|povwideo.net|powvideo.net /czf*.$image,domain=100percentfedup.com
uBlock-LLC · May 24, 2019 · 5dc7786 · 5dc7786
2 parents 90ac9d5 + 847bab7
commit 5dc7786
Show file tree

Hide file tree

Showing 7 changed files with 360 additions and 368 deletions.
diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
 
     "name": "uBlock",
-    "version": "0.9.5.15",
+    "version": "0.9.5.16",
 
     "default_locale": "en",
     "description": "__MSG_extShortDesc__",

diff --git a/src/js/background.js b/src/js/background.js
@@ -91,8 +91,8 @@ return {
 
     // read-only
     systemSettings: {
-        compiledMagic: 'eopszukpsddd',
-        selfieMagic: 'menhiasrsddd'
+        compiledMagic: 'krpszukpsddd',
+        selfieMagic: 'ednhiasrsddd'
     },
     restoreBackupSettings: {
         lastRestoreFile: '',

diff --git a/src/js/messaging.js b/src/js/messaging.js
@@ -477,6 +477,7 @@ var filterRequests = function(pageStore, details) {
         request = requests[i];
         context.requestURL = vAPI.punycodeURL(request.url);
         context.requestHostname = µburi.hostnameFromURI(request.url);
+        context.requestDomain = µburi.domainFromHostname(context.requestHostname);
         context.requestType = tagNameToRequestTypeMap[request.tagName];
         if ( isBlockResult(pageStore.filterRequest(context)) ) {
             request.collapse = true;

diff --git a/src/js/pagestore.js b/src/js/pagestore.js
@@ -251,6 +251,7 @@ FrameStore.prototype.init = function(rootHostname, frameURL) {
     this.pageURL = frameURL;
     this.pageHostname = µburi.hostnameFromURI(frameURL);
     this.pageDomain = µburi.domainFromHostname(this.pageHostname) || this.pageHostname;
+    this.pageHostnameHashes = µb.getHostnameHashesFromLabelsBackward(this.pageHostname, this.pageDomain, false);
     return this;
 };
 
@@ -440,6 +441,7 @@ PageStore.prototype.createContextFromPage = function() {
     var context = new µb.tabContextManager.createContext(this.tabId);
     context.pageHostname = context.rootHostname;
     context.pageDomain = context.rootDomain;
+    context.pageHostnameHashes = context.rootHostnameHashes;
     return context;
 };
 
@@ -449,9 +451,11 @@ PageStore.prototype.createContextFromFrameId = function(frameId) {
         var frameStore = this.frames[frameId];
         context.pageHostname = frameStore.pageHostname;
         context.pageDomain = frameStore.pageDomain;
+        context.pageHostnameHashes = frameStore.pageHostnameHashes;
     } else {
         context.pageHostname = context.rootHostname;
         context.pageDomain = context.rootDomain;
+        context.pageHostnameHashes = context.rootHostnameHashes;
     }
     return context;
 };
@@ -460,6 +464,7 @@ PageStore.prototype.createContextFromFrameHostname = function(frameHostname) {
     var context = new µb.tabContextManager.createContext(this.tabId);
     context.pageHostname = frameHostname;
     context.pageDomain = µb.URI.domainFromHostname(frameHostname) || frameHostname;
+    context.pageHostnameHashes = µb.getHostnameHashesFromLabelsBackward(context.pageHostname, context.pageDomain, false);
     return context;
 };