From 12fc8faf3a80ba496438b478f10735fe1374a7d9 Mon Sep 17 00:00:00 2001 From: gorhill Date: Tue, 31 Mar 2015 07:51:01 -0400 Subject: [PATCH] #1134: code review to fix unwanted side effect if previous fix --- src/js/dynamic-net-filtering.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/js/dynamic-net-filtering.js b/src/js/dynamic-net-filtering.js index 520891940..dc8a1888f 100644 --- a/src/js/dynamic-net-filtering.js +++ b/src/js/dynamic-net-filtering.js @@ -319,10 +319,21 @@ var is3rdParty = function(srcHostname, desHostname) { if ( desHostname === '*' ) { return false; } + + // This case occurs for matrix rendering + if ( srcHostname === '*' ) { + return false; + } var srcDomain = domainFromHostname(srcHostname); + + // This can very well occurs, for examples: + // - localhost + // - file-scheme + // etc. if ( srcDomain === '' ) { srcDomain = srcHostname !== '' ? srcHostname : desHostname; } + if ( desHostname.slice(0 - srcDomain.length) !== srcDomain ) { return true; }