mirror of
https://github.com/roytam1/mozilla45esr.git
synced 2026-05-26 15:39:48 +00:00
import changes from tenfourfox-history:
- #493: image max-width M823483 M1247929 (1e8048f6f) - closes #493: fix height for flexbox case M1030952 M1180107 (3d108a56a) (with fix for msvc) - closes #484: wallpaper unrenderable icons getting into Cocoa menus (35862d42c) - revert UA fx60 change, add as new agent, add IE11 (3698c7959) - #469: a few more hosts for adblock (a2c8faf0b) - #491: M1443891 M1444231 M1443092 M1448774 M1452416 (9661a95c2) - #491: update certs and pins (8aaf95173) - #491: backout M1452416 for bustage, we'll think of another way to implement this (f6c7b6f4a) - fix for x86 by Ken/MacPorts (cadf0e4e0) - #497: improve DOM KeyboardEvent support (5eacbf2ea) - #483: okay, let's try tuning Purple again now that 485 is fixed (aabc8bc25) - #469: more adblock entries (29b022d4d) - #399: tune up HTTP cache M1248003 M1248389 (f5d414283) - #491: new fix for M1452416 (3f1408e19) - #491: M1393367 M1452202 (c4a05454d) - #491: update certs and pins (3642b952f) - #491: M1452075 (cb09bc27d) - #469: and a couple more (efceaf1c0) - #491: M1449548 (adapted for 45) (05c79ddd2) - #491: update certs and pins (again) (619952aa4) - #499: same-site cookie support (64dc7e7f8)
This commit is contained in:
@@ -839,6 +839,7 @@ nsScriptSecurityManager::CheckLoadURIWithPrincipal(nsIPrincipal* aPrincipal,
|
||||
BLOK("static.yieldmo.com") ||
|
||||
|
||||
BLOK("ads.rubiconproject.com") ||
|
||||
BLOK("fastlane.rubiconproject.com") ||
|
||||
|
||||
BLOK("cdn.engine.4dsply.com") ||
|
||||
|
||||
@@ -846,6 +847,7 @@ nsScriptSecurityManager::CheckLoadURIWithPrincipal(nsIPrincipal* aPrincipal,
|
||||
BLOK("as-sec.casalemedia.com") ||
|
||||
|
||||
BLOK("loadm.exelator.com") ||
|
||||
BLOK("loadus.exelator.com") ||
|
||||
|
||||
BLOK("sdk.streamrail.com") ||
|
||||
|
||||
@@ -924,6 +926,7 @@ nsScriptSecurityManager::CheckLoadURIWithPrincipal(nsIPrincipal* aPrincipal,
|
||||
|
||||
BLOK("cdn.nsstatic.net") ||
|
||||
|
||||
BLOK("www.bkrtx.com") ||
|
||||
BLOK("tags.bkrtx.com") ||
|
||||
|
||||
BLOK("yads.c.yimg.jp") ||
|
||||
@@ -1058,6 +1061,51 @@ nsScriptSecurityManager::CheckLoadURIWithPrincipal(nsIPrincipal* aPrincipal,
|
||||
BLOK("api.b2c.com") ||
|
||||
|
||||
BLOK("bounceexchange.com") ||
|
||||
|
||||
BLOK("bullseye.backbeatmedia.com") ||
|
||||
BLOK("adserver1.backbeatmedia.com") ||
|
||||
|
||||
BLOK("live.sekindo.com") ||
|
||||
|
||||
BLOK("cdn.spotxcdn.com") ||
|
||||
|
||||
BLOK("api.addmee.net") ||
|
||||
|
||||
BLOK("a.intentmedia.net") ||
|
||||
BLOK("a.cdn.intentmedia.net") ||
|
||||
|
||||
BLOK("ads.pictela.net") ||
|
||||
BLOK("secure-ads.pictela.net") ||
|
||||
|
||||
BLOK("bid.contextweb.com") ||
|
||||
BLOK("tag.contextweb.com") ||
|
||||
|
||||
BLOK("p.cpx.to") ||
|
||||
BLOK("s.cpx.to") ||
|
||||
|
||||
BLOK("ardrone.swoop.com") ||
|
||||
BLOK("www.swpsvc.com") ||
|
||||
BLOK("client-deploy.swpcld.com") ||
|
||||
|
||||
BLOK("id.rlcdn.com") ||
|
||||
|
||||
BLOK("tags.bluekai.com") ||
|
||||
BLOK("stags.bluekai.com") ||
|
||||
|
||||
BLOK("js.gumgum.com") ||
|
||||
|
||||
BLOK("cdn.digitru.st") ||
|
||||
|
||||
BLOK("collector.cint.com") ||
|
||||
|
||||
BLOK("dpm.demdex.net") ||
|
||||
|
||||
BLOK("www.uciservice.com") ||
|
||||
|
||||
BLOK("f.cdn-net.com") ||
|
||||
BLOK("uk.cdn-net.com") ||
|
||||
BLOK("six.cdn-net.com") ||
|
||||
BLOK("www.cdn-net.com") ||
|
||||
0) {
|
||||
#undef BLOK
|
||||
// Yup.
|
||||
|
||||
Reference in New Issue
Block a user