roytam1/mozilla45esr
1
0
Fork 0
mirror of https://github.com/roytam1/mozilla45esr.git synced 2026-05-26 15:39:48 +00:00
Code Issues Projects Releases Wiki Activity

import changes from tenfourfox-history:

Browse Source 
- some additional minor optimizations (886b2ce51)
- #465: gc, jsobj, RegExp (07bfa6ed5)
- #465: dom/media/webm, MDSM (2a306d565)
- #477: reorganize and optimize font URL blacklist (51fffd909)
- #469: yep dose hosts for dat adblock yo (233b4e53e)
- whitespace cleanup (29ba7f68c)
- #478: M1434580 M1261175 M1426087 M1426988 (d3411e70e)
- #478: update certs and pins (b89b0fe92)
- whitespace removal (f3c3705fb)
- #478: M1375217 (with M1350752, fixes M1348955) (33ba64fc0)
- closes #479: suppress bogus assert (cafee7fa3)
- #479: mark for future reference (e699487e9)
- values were not endian dependent (crash) (9ed7fdacb)
- further endianness work for font tags (3f509d76d)
- #478: M1416307 M1430557 M1416529 M1324042 M1428947 M1437087 M1440926 M1425520 (8b45eb124)
- #478: M1437507 M1437450 (fccda54f3)
- #478: update certs and pins (033c49d99)
- #478: M1443865 (for our Intel friends if they ever get it working) (82c63992b)
- #469: super duper more hosts for super duper basic adblock (17bae42e3)
This commit is contained in:
Roy Tam
2018-05-31 20:47:15 +08:00
parent 31dac09b74
commit 91fbf2967a
37 changed files with 5071 additions and 2846 deletions
Download Patch File Download Diff File Expand all files Collapse all files
caps/nsScriptSecurityManager.cpp
+36 -1
View File
@@ -693,7 +693,7 @@ nsScriptSecurityManager::CheckLoadURIWithPrincipal(nsIPrincipal* aPrincipal,
if (mIsTenFourFoxAdBlockEnabled &&
(targetScheme.EqualsLiteral("http") || targetScheme.EqualsLiteral("https"))) {
nsAutoCString hostname;
if (NS_SUCCEEDED(targetBaseURI->GetHost(hostname))) {
if (MOZ_LIKELY(NS_SUCCEEDED(targetBaseURI->GetHost(hostname)))) {
ToLowerCase(hostname);
#define BLOK(q) hostname.EqualsLiteral(q)
if (0 ||
@@ -705,6 +705,7 @@ nsScriptSecurityManager::CheckLoadURIWithPrincipal(nsIPrincipal* aPrincipal,
// blocking zdbb.net seems to be problematic
// https://github.com/AdguardTeam/AdguardFilters/issues/1278
// this may also be true for adziff.com
BLOK("c.amazon-adsystem.com") ||
@@ -786,12 +787,14 @@ nsScriptSecurityManager::CheckLoadURIWithPrincipal(nsIPrincipal* aPrincipal,
BLOK("cdn.viglink.com") ||
BLOK("xcp.go.sonobi.com") ||
BLOK("apex.go.sonobi.com") ||
BLOK("s.ntv.io") ||
BLOK("cdn.segment.com") ||
BLOK("cdn-gl.imrworldwide.com") ||
BLOK("secure-us.imrworldwide.com") ||
BLOK("secure-dcr.imrworldwide.com") ||
BLOK("labs-cdn.revcontent.com") ||
@@ -826,6 +829,7 @@ nsScriptSecurityManager::CheckLoadURIWithPrincipal(nsIPrincipal* aPrincipal,
BLOK("cdn.engine.4dsply.com") ||
BLOK("as.casalemedia.com") ||
BLOK("as-sec.casalemedia.com") ||
BLOK("loadm.exelator.com") ||
@@ -899,6 +903,7 @@ nsScriptSecurityManager::CheckLoadURIWithPrincipal(nsIPrincipal* aPrincipal,
BLOK("sb.monetate.net") ||
BLOK("se.monetate.net") ||
BLOK("ad.crwdcntrl.net") ||
BLOK("tags.crwdcntrl.net") ||
BLOK("cdn.nsstatic.net") ||
@@ -972,6 +977,36 @@ nsScriptSecurityManager::CheckLoadURIWithPrincipal(nsIPrincipal* aPrincipal,
BLOK("tags.mathtag.com") ||
BLOK("pixel.mathtag.com") ||
BLOK("a.teads.tv") ||
BLOK("cdn.teads.tv") ||
BLOK("cdata.carambo.la") ||
BLOK("route.carambo.la") ||
BLOK("us-ads.openx.net") ||
BLOK("s-static.innovid.com") ||
// This is controversial, but I'm pretty sure we
// don't want this.
BLOK("coinhive.com") ||
BLOK("ustatik.com") ||
BLOK("cdn.ustatik.com") ||
BLOK("adx.adform.net") ||
BLOK("s.spoutable.com") ||
BLOK("cdn.spoutable.com") ||
BLOK("ads.pubmatic.com") ||
BLOK("track.netshelter.net") ||
BLOK("t.neodatagroup.com") ||
BLOK("ads.servebom.com") ||
0) {
#undef BLOK
// Yup.