this fixes #1134

uBlock-LLC · Mar 31, 2015 · cd76d79 · cd76d79
1 parent 99a0d28
commit cd76d79
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/js/dynamic-net-filtering.js b/src/js/dynamic-net-filtering.js
@@ -321,7 +321,11 @@ var is3rdParty = function(srcHostname, desHostname) {
     }
     var srcDomain = domainFromHostname(srcHostname);
     if ( srcDomain === '' ) {
-        srcDomain = desHostname;
+        if ( srcHostname !== '' ) {
+            srcDomain = srcHostname;
+        } else {
+            srcDomain = desHostname;
+        }
     }
     if ( desHostname.slice(0 - srcDomain.length) !== srcDomain ) {
         return true;

diff --git a/src/js/pagestore.js b/src/js/pagestore.js
@@ -384,8 +384,8 @@ NetFilteringResultCache.prototype.pruneAsyncCallback = function() {
 
 /******************************************************************************/
 
-NetFilteringResultCache.prototype.lookup = function(url) {
-    return this.urls[url];
+NetFilteringResultCache.prototype.lookup = function(context) {
+    return this.urls[context.requestType + ' ' + context.requestURL];
 };
 
 /******************************************************************************/
@@ -645,7 +645,7 @@ PageStore.prototype.filterRequest = function(context) {
         return '';
     }
 
-    var entry = this.netFilteringCache.lookup(context.requestURL);
+    var entry = this.netFilteringCache.lookup(context);
     if ( entry !== undefined ) {
         //console.debug('cache HIT: PageStore.filterRequest("%s")', context.requestURL);
         return entry.result;