August 2014 - tor-commits - lists.torproject.org

[tor-browser/esr24] No bug, Automated HSTS preload list update from host bld-linux64-spot-344 - a=hsts-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 820ecd737f245717a8a39410ab978016aaf314ab Author: ffxbld <none@none> Date: Sat Jul 12 03:11:41 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-344 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 11 ++++++++--- security/manager/boot/src/nsSTSPreloadList.inc | 12 +++++++----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index dbd20ab..90da6bf 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -1,7 +1,6 @@ admin.google.com: did not receive HSTS header adsfund.org: could not connect to host airbnb.com: did not receive HSTS header -anycoin.me: did not receive HSTS header api.lookout.com: could not connect to host api.mega.co.nz: could not connect to host api.recurly.com: did not receive HSTS header @@ -24,6 +23,7 @@ checkout.google.com: did not receive HSTS header chrome-devtools-frontend.appspot.com: did not receive HSTS header chrome.google.com: did not receive HSTS header cloud.google.com: did not receive HSTS header +code-poets.co.uk: did not receive HSTS header code.google.com: did not receive HSTS header codereview.chromium.org: did not receive HSTS header crate.io: did not receive HSTS header @@ -36,6 +36,7 @@ dl.google.com: did not receive HSTS header docs.google.com: did not receive HSTS header donmez.ws: could not connect to host drive.google.com: did not receive HSTS header +dropbox.com: max-age too low: 2592000 dropcam.com: did not receive HSTS header edmodo.com: did not receive HSTS header email.lookout.com: could not connect to host @@ -57,7 +58,6 @@ groups.google.com: did not receive HSTS header haste.ch: could not connect to host history.google.com: did not receive HSTS header hostedtalkgadget.google.com: did not receive HSTS header -id.atlassian.com: did not receive HSTS header in.xero.com: max-age too low: 3600 intercom.io: did not receive HSTS header iop.intuit.com: max-age too low: 86400 @@ -84,8 +84,10 @@ nexth.us: could not connect to host noexpect.org: could not connect to host openshift.redhat.com: did not receive HSTS header ottospora.nl: could not connect to host +passwordbox.com: did not receive HSTS header paypal.com: max-age too low: 14400 payroll.xero.com: max-age too low: 3600 +piratenlogin.de: did not receive HSTS header platform.lookout.com: could not connect to host play.google.com: did not receive HSTS header prodpad.com: did not receive HSTS header @@ -99,8 +101,10 @@ security.google.com: did not receive HSTS header semenkovich.com: did not receive HSTS header serverdensity.io: did not receive HSTS header shops.neonisi.com: could not connect to host +silentcircle.com: did not receive HSTS header silentcircle.org: could not connect to host simon.butcher.name: max-age too low: 2629743 +simple.com: did not receive HSTS header sites.google.com: did not receive HSTS header sol.io: could not connect to host souyar.de: could not connect to host @@ -110,7 +114,7 @@ spreadsheets.google.com: did not receive HSTS header square.com: did not receive HSTS header ssl.google-analytics.com: did not receive HSTS header ssl.panoramio.com: did not receive HSTS header -stocktrade.de: did not receive HSTS header +stocktrade.de: could not connect to host sunshinepress.org: could not connect to host surfeasy.com: did not receive HSTS header talk.google.com: did not receive HSTS header @@ -122,6 +126,7 @@ webmail.mayfirst.org: did not receive HSTS header whonix.org: did not receive HSTS header www.cueup.com: did not receive HSTS header www.developer.mydigipass.com: could not connect to host +www.dropbox.com: max-age too low: 2592000 www.elanex.biz: did not receive HSTS header www.gmail.com: did not receive HSTS header www.googlemail.com: did not receive HSTS header diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index 8e1a1aa..dd480ac 100644 --- a/security/manager/boot/src/nsSTSPreloadList.inc +++ b/security/manager/boot/src/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/ #include "mozilla/StandardInteger.h" -const PRTime gPreloadListExpirationTime = INT64_C(1414231532587000); +const PRTime gPreloadListExpirationTime = INT64_C(1416045947439000); class nsSTSPreload { @@ -18,12 +18,14 @@ class nsSTSPreload }; static const nsSTSPreload kSTSPreloadList[] = { + { "accounts.firefox.com", true }, { "accounts.google.com", true }, { "aclu.org", false }, { "activiti.alfresco.com", false }, { "adsfund.org", true }, { "aladdinschools.appspot.com", false }, { "alpha.irccloud.com", false }, + { "anycoin.me", true }, { "api.intercom.io", false }, { "api.simple.com", false }, { "api.xero.com", false }, @@ -94,6 +96,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "haste.ch", true }, { "heha.co", true }, { "howrandom.org", true }, + { "id.atlassian.com", true }, { "id.mayfirst.org", false }, { "imouto.my", false }, { "inertianetworks.com", true }, @@ -153,16 +156,15 @@ static const nsSTSPreload kSTSPreloadList[] = { { "passport.yandex.ru", false }, { "passport.yandex.ua", false }, { "passwd.io", true }, - { "passwordbox.com", false }, { "paste.linode.com", false }, { "pastebin.linode.com", false }, { "pay.gigahost.dk", true }, { "paymill.com", true }, { "paymill.de", false }, - { "piratenlogin.de", true }, { "pixi.me", true }, { "plus.google.com", false }, { "plus.sandbox.google.com", false }, + { "portal.tirol.gv.at", true }, { "publications.qld.gov.au", false }, { "pult.co", true }, { "pypi.python.org", true }, @@ -176,9 +178,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "securityheaders.com", true }, { "seifried.org", true }, { "shodan.io", true }, - { "silentcircle.com", false }, { "simbolo.co.uk", false }, - { "simple.com", false }, { "skydrive.live.com", false }, { "squareup.com", false }, { "stage.wepay.com", false }, @@ -216,6 +216,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "wf-training-master.appspot.com", true }, { "wf-trial-hrd.appspot.com", true }, { "wiki.python.org", true }, + { "wildbee.org", true }, { "wiz.biz", true }, { "writeapp.me", false }, { "www.aclu.org", false }, @@ -253,5 +254,6 @@ static const nsSTSPreload kSTSPreloadList[] = { { "www.wepay.com", false }, { "www.zenpayroll.com", false }, { "xbrlsuccess.appspot.com", true }, + { "z.ai", true }, { "zenpayroll.com", false }, };

1 0

[tor-browser/esr24] No bug, Automated blocklist update from host bld-linux64-spot-344 - a=blocklist-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 07d317c8e5220905133776478c7231c834d9bb34 Author: ffxbld <none@none> Date: Sat Jul 12 03:11:42 2014 -0700 No bug, Automated blocklist update from host bld-linux64-spot-344 - a=blocklist-update --- browser/app/blocklist.xml | 874 +++++++++++++++++++++++++-------------------- 1 file changed, 483 insertions(+), 391 deletions(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 225701e..6deef11 100644 --- a/browser/app/blocklist.xml +++ b/browser/app/blocklist.xml @@ -1,154 +1,158 @@ <?xml version="1.0"?> -<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1403823002000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1405034316000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <versionRange minVersion="0" maxVersion="*" severity="3"> + <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i58" id="webmaster(a)buzzzzvideos.info"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> - <emItem blockID="i402" id="{99079a25-328f-4bd4-be04-00955acaa0a7}"> - <versionRange minVersion="0.1" maxVersion="4.3.1.00" severity="1"> + <emItem blockID="i652" id="garg_sms(a)yahoo.in"> + <versionRange minVersion="67.9" maxVersion="67.9" severity="3"> </versionRange> - <versionRange minVersion="0" maxVersion="*" severity="1"> - </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i71" id="youtube(a)2youtube.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i404" id="{a9bb9fa0-4122-4c75-bd9a-bc27db3f9155}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i8" id="{B13721C7-F507-4982-B2E5-502A71474FED}"> <versionRange minVersion=" " severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i107" os="WINNT" id="{ABDE892B-13A8-4d1b-88E6-365A6E755758}"> <versionRange minVersion="0" maxVersion="15.0.5" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i88" id="anttoolbar(a)ant.com"> <versionRange minVersion="2.4.6.4" maxVersion="2.4.6.4" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i484" id="plugin(a)getwebcake.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> - <emItem blockID="i433" id="{c95a4e8e-816d-4655-8c79-d736da1adb6d}"> - <versionRange minVersion="0" maxVersion="*" severity="1"> + <emItem blockID="i640" id="jid0-l9BxpNUhx1UUgRfKigWzSfrZqAc@jetpack"> + <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i65" id="activity(a)facebook.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i527" id="/^({bfec236d-e122-4102-864f-f5f19d897f5e}|{3f842035-47f4-4f10-846b-6199b07f09b8}|{92ed4bbd-83f2-4c70-bb4e-f8d3716143fe})$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i535" id="/^ext(a)WebexpEnhancedV1alpha[0-9]+\.net$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i105" id="{95ff02bc-ffc6-45f0-a5c8-619b8226a9de}"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i626" id="{20AD702C-661E-4534-8CE9-BA4EC9AD6ECC}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i20" id="{AB2CE124-6272-4b12-94A9-7303C7397BD1}"> <versionRange minVersion="0.1" maxVersion="5.2.0.7164" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i506" id="/^ext@bettersurfplus/"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i400" id="{dd6b651f-dfb9-4142-b0bd-09912ad22674}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i488" id="jid1-4P0kohSJxU1qGg@jetpack"> <versionRange minVersion="1.2.50" maxVersion="1.2.50" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i578" id="jid1-XLjasWL55iEE1Q@jetpack"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> + </prefs> + </emItem> + <emItem blockID="i660" id="youplayer(a)addons.mozilla.org"> + <versionRange minVersion="79.9.8" maxVersion="208.0.1" severity="3"> + </versionRange> + <prefs> </prefs> </emItem> <emItem blockID="i529" id="/^(torntv@torntv\.com|trtv3@trtv\.com|torntv2@torntv\.com|e2fd07a6-e282-4f2e-8965-85565fcb6384@b69158e6-3c3b-476c-9d98-ae5838c5b707\.com)$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i486" id="xz123(a)ya456.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i392" id="{EEE6C361-6118-11DC-9C72-001320C79847}"> <versionRange minVersion="0" maxVersion="1.7.999" severity="1"> </versionRange> - <versionRange minVersion="0" maxVersion="*" severity="1"> + <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i406" id="{bf7380fa-e3b4-4db2-af3e-9d8783a45bfc}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i4" id="{4B3803EA-5230-4DC3-A7FC-33638F3D3542}"> @@ -157,13 +161,13 @@ <versionRange minVersion="3.0a1" maxVersion="*" /> </targetApplication> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i492" id="{af95cc15-3b9b-45ae-8d9b-98d08eda3111}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i24" id="{6E19037A-12E3-4295-8915-ED48BC341614}"> @@ -172,67 +176,67 @@ <versionRange minVersion="3.7a1pre" maxVersion="*" /> </targetApplication> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i64" id="royal(a)facebook.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i72" os="WINNT" id="{4ED1F68A-5463-4931-9384-8FFF5ED91D92}"> <versionRange minVersion="3.4.1" maxVersion="3.4.1.194" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i100" id="{394DCBA4-1F92-4f8e-8EC9-8D2CB90CB69B}"> <versionRange minVersion="2.5.0" maxVersion="2.5.0" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i77" id="{fa277cfc-1d75-4949-a1f9-4ac8e41b2dfd}"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i40" id="{28387537-e3f9-4ed7-860c-11e69af4a8a0}"> <versionRange minVersion="0.1" maxVersion="4.3.1.00" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i491" id="{515b2424-5911-40bd-8a2c-bdb20286d8f5}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i498" id="hoverst(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i127" id="plugin(a)youtubeplayer.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i430" id="1chtw(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i78" id="socialnetworktools(a)mozilla.doslash.org"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i238" id="/^pink@.*\.info$/"> @@ -241,19 +245,19 @@ <versionRange minVersion="18.0" maxVersion="*" /> </targetApplication> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i516" id="/^({3f3cddf8-f74d-430c-bd19-d2c9147aed3d}|{515b2424-5911-40bd-8a2c-bdb20286d8f5}|{17464f93-137e-4646-a0c6-0dc13faf0113}|{d1b5aad5-d1ae-4b20-88b1-feeaeb4c1ebc}|{aad50c91-b136-49d9-8b30-0e8d3ead63d0})$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i630" id="webbooster(a)iminent.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> <pref>browser.startup.homepage</pref> <pref>browser.search.defaultenginename</pref> </prefs> @@ -261,105 +265,105 @@ <emItem blockID="i174" id="info(a)thebflix.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i478" id="{7e8a1050-cf67-4575-92df-dcc60e7d952d}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i582" id="discoverypro(a)discoverypro.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i172" id="info(a)bflix.info"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i93" id="{68b8676b-99a5-46d1-b390-22411d8bcd61}"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i596" id="{b99c8534-7800-48fa-bd71-519a46cdc7e1}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i140" id="mozillahmpg(a)mozilla.org"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i500" id="{2aab351c-ad56-444c-b935-38bffe18ad26}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i494" id="/^({e9df9360-97f8-4690-afe6-996c80790da4}|{687578b9-7132-4a7a-80e4-30ee31099e03}|{46a3135d-3683-48cf-b94c-82655cbc0e8a}|{49c795c2-604a-4d18-aeb1-b3eba27e5ea2}|{7473b6bd-4691-4744-a82b-7854eb3d70b6}|{96f454ea-9d38-474f-b504-56193e00c1a5})$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i467" id="plugin(a)analytic-s.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i47" id="youtube(a)youtube2.com"> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i360" id="ytd(a)mybrowserbar.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i5" id="support(a)daemon-tools.cc"> <versionRange minVersion=" " maxVersion="1.0.0.5"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i436" id="/(\{7aeae561-714b-45f6-ace3-4a8aed6e227b\})|(\{01e86e69-a2f8-48a0-b068-83869bdba3d0\})|(\{77f5fe49-12e3-4cf5-abb4-d993a0164d9e\})/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i97" id="support3_en(a)adobe122.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i342" id="lbmsrvfvxcblvpane(a)lpaezhjez.org"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i481" id="{B40794A0-7477-4335-95C5-8CB9BBC5C4A5}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <versionRange minVersion="0" maxVersion="*" severity="3"> + <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <versionRange minVersion="0" maxVersion="*" severity="3"> + <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i11" id="yslow(a)yahoo-inc.com"> @@ -368,221 +372,229 @@ <versionRange minVersion="3.5.7" maxVersion="*" /> </targetApplication> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i62" id="jid0-EcdqvFOgWLKHNJPuqAnawlykCGZ@jetpack"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i624" id="/^({b95faac1-a3d7-4d69-8943-ddd5a487d966}|{ecce0073-a837-45a2-95b9-600420505f7e}|{2713b394-286f-4d7c-89ea-4174eeab9f5a}|{da7a20cf-bef4-4342-ad78-0240fdf87055})$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i472" id="linksicle(a)linksicle.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i99" id="pfzPXmnzQRXX6(a)2iABkVe.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i66" id="youtubeer(a)youtuber.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i438" id="{02edb56b-9b33-435b-b7df-b2843273a694}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i450" id="{dff137ae-1ffd-11e3-8277-b8ac6f996f26}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i521" id="/^({66b103a7-d772-4fcd-ace4-16f79a9056e0}|{6926c7f7-6006-42d1-b046-eba1b3010315}|{72cabc40-64b2-46ed-8648-26d831761150}|{73ee2cf2-7b76-4c49-b659-c3d8cf30825d}|{ca6446a5-73d5-4c35-8aa1-c71dc1024a18}|{5373a31d-9410-45e2-b299-4f61428f0be4})$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i499" id="{babb9931-ad56-444c-b935-38bffe18ad26}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i356" id="{341f4dac-1966-47ff-aacf-0ce175f1498a}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i101" id="{3a12052a-66ef-49db-8c39-e5b0bd5c83fa}"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i111" os="WINNT" id="{C3949AC2-4B17-43ee-B4F1-D26B9D42404D}"> <versionRange minVersion="0" maxVersion="15.0.5" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i136" id="Adobe(a)flash.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i543" id="{badea1ae-72ed-4f6a-8c37-4db9a4ac7bc9}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i447" id="{B18B1E5C-4D81-11E1-9C00-AFEB4824019B}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i519" id="703db0db-5fe9-44b6-9f53-c6a91a0ad5bd(a)7314bc82-969e-4d2a-921b-e5edd0b02cf1.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i537" id="rally_toolbar_ff(a)bulletmedia.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i526" id="/^({83a8ce1b-683c-4784-b86d-9eb601b59f38}|{ef1feedd-d8da-4930-96f1-0a1a598375c6}|{79ff1aae-701f-4ca5-aea3-74b3eac6f01b}|{8a184644-a171-4b05-bc9a-28d75ffc9505}|{bc09c55d-0375-4dcc-836e-0e3c8addfbda}|{cef81415-2059-4dd5-9829-1aef3cf27f4f})$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i532" id="249911bc-d1bd-4d66-8c17-df533609e6d8(a)c76f3de9-939e-4922-b73c-5d7a3139375d.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i258" id="helperbar(a)helperbar.com"> <versionRange minVersion="0" maxVersion="1.0" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i98" id="youtubeeing(a)youtuberie.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i515" id="/^({bf9194c2-b86d-4ebc-9b53-1c08b6ff779e}|{61a83e16-7198-49c6-8874-3e4e8faeb4f3}|{f0af464e-5167-45cf-9cf0-66b396d1918c}|{5d9968c3-101c-4944-ba71-72d77393322d}|{01e86e69-a2f8-48a0-b068-83869bdba3d0})$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i549" id="/^firefox@(albrechto|swiftbrowse|springsmart|storimbo|squirrelweb|betterbrowse|lizardlink|rolimno|browsebeyond|clingclang|weblayers|kasimos|higher-aurum|xaven|bomlabio)\.(com?|net|org|info|biz)$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i168" id="flashX(a)adobe.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i39" id="{c2d64ff7-0ab8-4263-89c9-ea3b0f8f050c}"> <versionRange minVersion="0.1" maxVersion="4.3.1.00" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i42" id="{D19CA586-DD6C-4a0a-96F8-14644F340D60}"> <versionRange minVersion="0.1" maxVersion="14.4.0" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i449" id="gystqfr(a)ylgga.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i502" id="{df6bb2ec-333b-4267-8c4f-3f27dc8c6e07}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <versionRange minVersion="0" maxVersion="*" severity="3"> + <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i142" id="{a3a5c777-f583-4fef-9380-ab4add1bc2a8}"> <versionRange minVersion="2.0.3" maxVersion="2.0.3"> </versionRange> - <versionRange minVersion="4.2" maxVersion="4.2" severity="3"> + <versionRange minVersion="4.2" maxVersion="4.2" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i306" id="{ADFA33FD-16F5-4355-8504-DF4D664CFE10}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> + </prefs> + </emItem> + <emItem blockID="i634" id="jid1-4vUehhSALFNqCw@jetpack"> + <versionRange minVersion="100.7" maxVersion="100.7" severity="3"> + </versionRange> + <versionRange minVersion="99.7" maxVersion="99.7" severity="3"> + </versionRange> + <prefs> </prefs> </emItem> <emItem blockID="i63" id="youtube(a)youtuber.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i398" id="{377e5d4d-77e5-476a-8716-7e70a9272da0}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i18" id="msntoolbar(a)msn.com"> <versionRange minVersion=" " maxVersion="6.*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i358" id="lfind(a)nijadsoft.net"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i628" id="ffxtlbr(a)iminent.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> <pref>browser.startup.homepage</pref> <pref>browser.search.defaultenginename</pref> </prefs> @@ -590,49 +602,49 @@ <emItem blockID="i228" id="crossriderapp5060(a)crossrider.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i465" id="trtv3(a)trtv.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i554" id="lightningnewtab(a)gmail.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i550" id="colmer(a)yopmail.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i618" id="toolbar(a)ask.com"> <versionRange minVersion="3.15.5" maxVersion="3.15.5.*" severity="1"> </versionRange> - <versionRange minVersion="3.15.8" maxVersion="3.15.8.*" severity="1"> + <versionRange minVersion="3.15.8" maxVersion="3.15.8.*" severity="1"> </versionRange> - <versionRange minVersion="3.15.10" maxVersion="3.15.11.*" severity="1"> + <versionRange minVersion="3.15.10" maxVersion="3.15.11.*" severity="1"> </versionRange> - <versionRange minVersion="3.15.13" maxVersion="3.15.13.*" severity="1"> + <versionRange minVersion="3.15.13" maxVersion="3.15.13.*" severity="1"> </versionRange> - <versionRange minVersion="3.15.18" maxVersion="3.15.20.*" severity="1"> + <versionRange minVersion="3.15.18" maxVersion="3.15.20.*" severity="1"> </versionRange> - <versionRange minVersion="3.15.22" maxVersion="3.15.22.*" severity="1"> + <versionRange minVersion="3.15.22" maxVersion="3.15.22.*" severity="1"> </versionRange> - <versionRange minVersion="3.15.24" maxVersion="3.15.24.*" severity="1"> + <versionRange minVersion="3.15.24" maxVersion="3.15.24.*" severity="1"> </versionRange> - <versionRange minVersion="3.15.26" maxVersion="3.15.26.*" severity="1"> + <versionRange minVersion="3.15.26" maxVersion="3.15.26.*" severity="1"> </versionRange> - <versionRange minVersion="3.15.28" maxVersion="3.15.28.*" severity="1"> + <versionRange minVersion="3.15.28" maxVersion="3.15.28.*" severity="1"> </versionRange> - <versionRange minVersion="3.15.31" maxVersion="3.15.31.*" severity="1"> + <versionRange minVersion="3.15.31" maxVersion="3.15.31.*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i75" os="Darwin,Linux" id="firebug(a)software.joehewitt.com"> @@ -641,255 +653,285 @@ <versionRange minVersion="9.0a1" maxVersion="9.*" /> </targetApplication> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i514" id="/^(67314b39-24e6-4f05-99f3-3f88c7cddd17@6c5fa560-13a3-4d42-8e90-53d9930111f9\.com|ffxtlbr@visualbee\.com|{7aeae561-714b-45f6-ace3-4a8aed6e227b}|{7093ee04-f2e4-4637-a667-0f730797b3a0}|{53c4024f-5a2e-4f2a-b33e-e8784d730938})$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i348" id="{13c9f1f9-2322-4d5c-81df-6d4bf8476ba4}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i338" id="{1FD91A9C-410C-4090-BBCC-55D3450EF433}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i364" id="{FE1DEEEA-DB6D-44b8-83F0-34FC0F9D1052}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i59" id="ghostviewer(a)youtube2.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i222" id="dealcabby@jetpack"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i51" id="admin(a)youtubeplayer.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> + </prefs> + </emItem> + <emItem blockID="i433" id="{c95a4e8e-816d-4655-8c79-d736da1adb6d}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> </prefs> </emItem> <emItem blockID="i352" id="vpyekkifgv(a)vpyekkifgv.org"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i466" id="afext(a)anchorfree.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> + </prefs> + </emItem> + <emItem blockID="i650" id="jid1-qj0w91o64N7Eeg@jetpack"> + <versionRange minVersion="39.5.1" maxVersion="47.0.4" severity="3"> + </versionRange> + <prefs> </prefs> </emItem> <emItem blockID="i468" id="05dd836e-2cbd-4204-9ff3-2f8a8665967d(a)a8876730-fb0c-4057-a2fc-f9c09d438e81.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i522" id="/^({976cd962-e0ca-4337-aea7-d93fae63a79c}|{525ba996-1ce4-4677-91c5-9fc4ead2d245}|{91659dab-9117-42d1-a09f-13ec28037717}|{c1211069-1163-4ba8-b8b3-32fc724766be})$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> + </prefs> + </emItem> + <emItem blockID="i642" id="{bee6eb20-01e0-ebd1-da83-080329fb9a3a}"> + <versionRange minVersion="40.10.1" maxVersion="44.10.1" severity="3"> + </versionRange> + <prefs> </prefs> </emItem> <emItem blockID="i479" id="mbrsepone(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> - <emItem blockID="i620" id="{21EAF666-26B3-4A3C-ABD0-CA2F5A326744}"> - <versionRange minVersion="0" maxVersion="*" severity="3"> + <emItem blockID="i666" id="wecarereminder@bryan"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> + <emItem blockID="i646" id="{e1aaa9f8-4500-47f1-9a0a-b02bd60e4076}"> + <versionRange minVersion="178.7.0" maxVersion="178.7.0" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i552" id="jid0-O6MIff3eO5dIGf5Tcv8RsJDKxrs@jetpack"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i256" id="/^[0-9a-f]+(a)[0-9a-f]+\.info/"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i584" id="{52b0f3db-f988-4788-b9dc-861d016f4487}"> <versionRange minVersion="0" maxVersion="0.1.9999999" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i370" id="happylyrics(a)hpyproductions.net"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i440" id="{2d069a16-fca1-4e81-81ea-5d5086dcbd0c}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i396" id="/@(ft|putlocker|clickmovie|m2k|sharerepo|smarter-?)downloader\.com$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i22" id="ShopperReports(a)ShopperReports.com"> <versionRange minVersion="3.1.22.0" maxVersion="3.1.22.0"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i376" id="{9e09ac65-43c0-4b9d-970f-11e2e9616c55}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i44" id="sigma(a)labs.mozilla"> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i501" id="xivars(a)aol.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i482" id="brasilescapeeight(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i226" id="{462be121-2b54-4218-bf00-b9bf8135b23f}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i246" id="support(a)vide1flash2.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i48" id="admin(a)youtubespeedup.com"> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i218" id="ffxtlbr(a)claro.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i10" id="{8CE11043-9A15-4207-A565-0C94C42D590D}"> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i548" id="/^firefox@(jumpflip|webconnect|browsesmart|mybuzzsearch|outobox|greygray|lemurleap|divapton|secretsauce|batbrowse|whilokii|linkswift|qualitink|browsefox|kozaka|diamondata|glindorus|saltarsmart|bizzybolt|websparkle)\.(com?|net|org|info|biz)$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i79" id="GifBlock(a)facebook.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i69" id="{977f3b97-5461-4346-92c8-a14c749b77c9}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i17" id="{3252b9ae-c69a-4eaf-9502-dc9c1f6c009e}"> <versionRange minVersion="2.2" maxVersion="2.2"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i115" id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i477" id="mbrnovone(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i13" id="{E8E88AB0-7182-11DF-904E-6045E0D72085}"> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i446" id="{E90FA778-C2B7-41D0-9FA9-3FEC1CA54D66}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i562" id="iobitapps(a)mybrowserbar.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i507" id="4zffxtbr-bs(a)VideoDownloadConverter_4z.com"> <versionRange minVersion="0" maxVersion="5.75.3.25126" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i7" id="{2224e955-00e9-4613-a844-ce69fccaae91}"> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i525" id="/^({65f9f6b7-2dae-46fc-bfaf-f88e4af1beca}|{9ed31f84-c8b3-4926-b950-dff74047ff79}|{0134af61-7a0c-4649-aeca-90d776060cb3}|{02edb56b-9b33-435b-b7df-b2843273a694}|{da51d4f6-3e7e-4ef8-b400-9198e0874606}|{b24577db-155e-4077-bb37-3fdd3c302bb5})$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i485" id="/^brasilescape.*\(a)facebook\.com$//"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i52" id="ff-ext@youtube"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> + </prefs> + </emItem> + <emItem blockID="i644" id="youtubeunblocker(a)unblocker.yt"> + <versionRange minVersion="43.4.1" maxVersion="77.5.1" severity="3"> + </versionRange> + <prefs> </prefs> </emItem> <emItem blockID="i38" id="{B7082FAA-CB62-4872-9106-E42DD88EDE45}"> @@ -898,112 +940,124 @@ <versionRange minVersion="3.7a1" maxVersion="*" /> </targetApplication> </versionRange> - <versionRange minVersion="3.3.1" maxVersion="*"> + <versionRange minVersion="3.3.1" maxVersion="*"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="5.0a1" maxVersion="*" /> </targetApplication> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i471" id="firefox(a)luckyleap.net"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i495" id="kallow(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i483" id="brasilescapefive(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i442" id="pennerdu(a)faceobooks.ws"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i43" id="supportaccessplugin(a)gmail.com"> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i588" id="quick_start(a)gmail.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i340" id="chiang(a)programmer.net"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> + </prefs> + </emItem> + <emItem blockID="i664" id="123456789(a)offeringmedia.com"> + <versionRange minVersion="0" maxVersion="*" severity="3"> + </versionRange> + <prefs> </prefs> </emItem> <emItem blockID="i54" id="applebeegifts(a)mozilla.doslash.org"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i16" id="{27182e60-b5f3-411c-b545-b44205977502}"> <versionRange minVersion="1.0" maxVersion="1.0"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i504" id="aytac(a)abc.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i92" id="play5(a)vide04flash.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i117" id="{ce7e73df-6a44-4028-8079-5927a588c948}"> <versionRange minVersion="0" maxVersion="1.0.8" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i474" id="{906000a4-88d9-4d52-b209-7a772970d91f}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i453" id="/^brasilescape.*\(a)facebook\.com$/"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> + </prefs> + </emItem> + <emItem blockID="i658" id="low_quality_flash(a)pie2k.com"> + <versionRange minVersion="46.2" maxVersion="47.1" severity="3"> + </versionRange> + <prefs> </prefs> </emItem> <emItem blockID="i109" id="{392e123b-b691-4a5e-b52f-c4c1027e749c}"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i598" id="{29b136c9-938d-4d3d-8df8-d649d9b74d02}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i286" id="{58bd07eb-0ee0-4df0-8121-dc9b693373df}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i1" id="mozilla_cc(a)internetdownloadmanager.com"> @@ -1012,176 +1066,176 @@ <versionRange minVersion="3.0a1" maxVersion="*" /> </targetApplication> </versionRange> - <versionRange minVersion=" " maxVersion="6.9.8"> + <versionRange minVersion=" " maxVersion="6.9.8"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="3.7a1pre" maxVersion="*" /> </targetApplication> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i308" id="9518042e-7ad6-4dac-b377-056e28d00c8f(a)f1cc0a13-4df1-4d66-938f-088db8838882.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i560" id="adsremoval(a)adsremoval.net"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i461" id="{8E9E3331-D360-4f87-8803-52DE43566502}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i542" id="/^({bf67a47c-ea97-4caf-a5e3-feeba5331231}|{24a0cfe1-f479-4b19-b627-a96bf1ea3a56})$/"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i493" id="12x3q(a)3244516.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i344" id="lrcsTube(a)hansanddeta.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i536" id="{25D77636-38B1-1260-887C-2D4AFA92D6A4}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i426" id="addlyrics(a)addlyrics.net"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i448" id="{0134af61-7a0c-4649-aeca-90d776060cb3}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i83" id="flash(a)adobee.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i104" id="yasd(a)youasdr3.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i530" id="{739df940-c5ee-4bab-9d7e-270894ae687a}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i524" id="/^({4e988b08-8c51-45c1-8d74-73e0c8724579}|{93ec97bf-fe43-4bca-a735-5c5d6a0a40c4}|{aed63b38-7428-4003-a052-ca6834d8bad3}|{0b5130a9-cc50-4ced-99d5-cda8cc12ae48}|{C4CFC0DE-134F-4466-B2A2-FF7C59A8BFAD})$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i68" id="flashupdate(a)adobe.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i382" id="{6926c7f7-6006-42d1-b046-eba1b3010315}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i432" id="lugcla21(a)gmail.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i91" id="crossriderapp4926(a)crossrider.com"> <versionRange minVersion="0" maxVersion="0.81.43" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i480" id="pluggets(a)gmail.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <versionRange minVersion="0" maxVersion="*" severity="1"> + <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i570" id="jid1-vW9nopuIAJiRHw@jetpack"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i520" id="/^({7316e43a-3ebd-4bb4-95c1-9caf6756c97f}|{0cc09160-108c-4759-bab1-5c12c216e005}|{ef03e721-f564-4333-a331-d4062cee6f2b}|{465fcfbb-47a4-4866-a5d5-d12f9a77da00}|{7557724b-30a9-42a4-98eb-77fcb0fd1be3}|{b7c7d4b0-7a84-4b73-a7ef-48ef59a52c3b})$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i460" id="{845cab51-d8d2-472f-8bd9-2b44642d97c2}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i547" id="{87934c42-161d-45bc-8cef-ef18abe2a30c}"> <versionRange minVersion="0" maxVersion="3.7.9999999999" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i6" id="{3f963a5b-e555-4543-90e2-c3908898db71}"> <versionRange minVersion=" " maxVersion="8.5"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i56" id="flash(a)adobe.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i538" id="{354dbb0a-71d5-4e9f-9c02-6c88b9d387ba}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i451" id="{e44a1809-4d10-4ab8-b343-3326b64c7cdd}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i540" id="/^(ffxtlbr@mixidj\.com|{c0c2693d-2ee8-47b4-9df7-b67a0ee31988}|{67097627-fd8e-4f6b-af4b-ecb65e50112e}|{f6f0f973-a4a3-48cf-9a7a-b7a69c30d71a}|{a3d0e35f-f1da-4ccb-ae77-e9d27777e68d}|{1122b43d-30ee-403f-9bfa-3cc99b0caddd})$/"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i216" id="fdm_ffext(a)freedownloadmanager.org"> @@ -1190,69 +1244,69 @@ <versionRange minVersion="3.0a1" maxVersion="*" /> </targetApplication> </versionRange> - <versionRange minVersion="1.5.7.5" maxVersion="1.5.7.5" severity="1"> + <versionRange minVersion="1.5.7.5" maxVersion="1.5.7.5" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i566" id="{77BEC163-D389-42c1-91A4-C758846296A5}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i533" id="extension(a)Fast_Free_Converter.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i362" id="addon(a)defaulttab.com"> <versionRange minVersion="0" maxVersion="1.4.4" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i12" id="masterfiler(a)gmail.com"> <versionRange severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i576" id="newmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i444" id="fplayer(a)adobe.flash"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i334" id="{0F827075-B026-42F3-885D-98981EE7B1AE}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i622" id="/^({ebd898f8-fcf6-4694-bc3b-eabc7271eeb1}|{46008e0d-47ac-4daa-a02a-5eb69044431a}|{213c8ed6-1d78-4d8f-8729-25006aa86a76}|{fa23121f-ee7c-4bd8-8c06-123d087282c5}|{19803860-b306-423c-bbb5-f60a7d82cde5})$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i518" id="/^({d6e79525-4524-4707-9b97-1d70df8e7e59}|{ddb4644d-1a37-4e6d-8b6e-8e35e2a8ea6c}|{e55007f4-80c5-418e-ac33-10c4d60db01e}|{e77d8ca6-3a60-4ae9-8461-53b22fa3125b}|{e89a62b7-248e-492f-9715-43bf8c507a2f}|{5ce3e0cb-aa83-45cb-a7da-a2684f05b8f3})$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i196" id="info(a)wxdownloadmanager.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i424" id="{C7AE725D-FA5C-4027-BB4C-787EF9F8248A}"> @@ -1261,61 +1315,67 @@ <versionRange minVersion="23.0a1" maxVersion="*" /> </targetApplication> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i336" id="CortonExt(a)ext.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i103" id="kdrgun(a)gmail.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i539" id="ScorpionSaver@jetpack"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i3" id="langpack-vi-VN(a)firefox.mozilla.org"> <versionRange minVersion="2.0" maxVersion="2.0"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i326" id="/^((support2_en@adobe14\.com)|(XN4Xgjw7n4@yUWgc\.com)|(C7yFVpIP@WeolS3acxgS\.com)|(Kbeu4h0z@yNb7QAz7jrYKiiTQ3\.com)|(aWQzX@a6z4gWdPu8FF\.com)|(CBSoqAJLYpCbjTP90@JoV0VMywCjsm75Y0toAd\.com)|(zZ2jWZ1H22Jb5NdELHS@o0jQVWZkY1gx1\.com))$/"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i470" id="extension(a)FastFreeConverter.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i162" id="{EB7508CA-C7B2-46E0-8C04-3E94A035BD49}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> + </prefs> + </emItem> + <emItem blockID="i620" id="{21EAF666-26B3-4A3C-ABD0-CA2F5A326744}"> + <versionRange minVersion="0" maxVersion="*" severity="3"> + </versionRange> + <prefs> </prefs> </emItem> <emItem blockID="i354" id="{c0c2693d-2ee8-47b4-9df7-b67a0ee31988}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i106" os="WINNT" id="{97E22097-9A2F-45b1-8DAF-36AD648C7EF4}"> <versionRange minVersion="0" maxVersion="15.0.5" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i46" id="{841468a1-d7f4-4bd3-84e6-bb0f13a06c64}"> @@ -1324,13 +1384,13 @@ <versionRange minVersion="9.0a1" maxVersion="9.0" /> </targetApplication> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i505" id="extacylife(a)a.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i15" id="personas(a)christopher.beard"> @@ -1339,267 +1399,295 @@ <versionRange minVersion="3.6" maxVersion="3.6.*" /> </targetApplication> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i304" id="{f0e59437-6148-4a98-b0a6-60d557ef57f4}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i86" id="{45147e67-4020-47e2-8f7a-55464fb535aa}"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i586" id="jid1-0xtMKhXFEs4jIg@jetpack"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i318" id="ffxtlbr(a)incredibar.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i19" id="{46551EC9-40F0-4e47-8E18-8E5CF550CFB8}"> <versionRange minVersion="1.1b1" maxVersion="1.1b1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i531" id="/^(4cb61367-efbf-4aa1-8e3a-7f776c9d5763@cdece6e9-b2ef-40a9-b178-291da9870c59\.com|0efc9c38-1ec7-49ed-8915-53a48b6b7600@e7f17679-2a42-4659-83c5-7ba961fdf75a\.com|6be3335b-ef79-4b0b-a0ba-b87afbc6f4ad@6bbb4d2e-e33e-4fa5-9b37-934f4fb50182\.com)$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i490" id="now.msn.com(a)services.mozilla.org"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i523" id="/^({7e8a1050-cf67-4575-92df-dcc60e7d952d}|{b3420a9c-a397-4409-b90d-bcf22da1a08a}|{eca6641f-2176-42ba-bdbe-f3e327f8e0af}|{707dca12-3f99-4d94-afea-06dcc0ae0108}|{aea20431-87fc-40be-bc5b-18066fe2819c}|{30ee6676-1ba6-455a-a7e8-298fa863a546})$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i312" id="extension21804(a)extension21804.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i545" id="superlrcs(a)svenyor.net"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i324" id="/^((34qEOefiyYtRJT@IM5Munavn\.com)|(Mro5Fm1Qgrmq7B@ByrE69VQfZvZdeg\.com)|(KtoY3KGxrCe5ie@yITPUzbBtsHWeCdPmGe\.com)|(9NgIdLK5Dq4ZMwmRo6zk@FNt2GCCLGyUuOD\.com)|(NNux7bWWW@RBWyXdnl6VGls3WAwi\.com)|(E3wI2n@PEHTuuNVu\.com)|(2d3VuWrG6JHBXbQdbr@3BmSnQL\.com))$/"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i503" id="{9CE11043-9A15-4207-A565-0C94C42D590D}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i431" id="chinaescapeone(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i108" id="{28bfb930-7620-11e1-b0c4-0800200c9a66}"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> + </prefs> + </emItem> + <emItem blockID="i656" id="hdv(a)vovcacik.addons.mozilla.org"> + <versionRange minVersion="102.0" maxVersion="102.0" severity="3"> + </versionRange> + <prefs> </prefs> </emItem> <emItem blockID="i262" id="{167d9323-f7cc-48f5-948a-6f012831a69f}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i320" id="torntv(a)torntv.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i528" id="008abed2-b43a-46c9-9a5b-a771c87b82da(a)1ad61d53-2bdc-4484-a26b-b888ecae1906.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i469" id="OKitSpace(a)OKitSpace.es"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i564" id="/^(firefox@vebergreat\.net|EFGLQA@78ETGYN-0W7FN789T87\.COM)$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i167" id="{b64982b1-d112-42b5-b1e4-d3867c4533f8}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i84" id="pink(a)rosaplugin.info"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> + </prefs> + </emItem> + <emItem blockID="i654" id="{7b1bf0b6-a1b9-42b0-b75d-252036438bdc}"> + <versionRange minVersion="27.8" maxVersion="27.9" severity="3"> + </versionRange> + <versionRange minVersion="27.8" maxVersion="27.9" severity="3"> + </versionRange> + <prefs> </prefs> </emItem> <emItem blockID="i568" os="Darwin" id="thunder(a)xunlei.com"> <versionRange minVersion="0" maxVersion="2.0.6" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i439" id="{d2cf9842-af95-48cd-b873-bfbb48cd7f5e}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i346" id="{a6e67e6f-8615-4fe0-a599-34a73fc3fba5}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i220" id="pricepeep(a)getpricepeep.com"> <versionRange minVersion="0" maxVersion="2.1.0.19.99" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i590" id="{94cd2cc3-083f-49ba-a218-4cda4b4829fd}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i544" id="/^(93abedcf-8e3a-4d02-b761-d1441e437c09@243f129d-aee2-42c2-bcd1-48858e1c22fd\.com|9acfc440-ac2d-417a-a64c-f6f14653b712@09f9a966-9258-4b12-af32-da29bdcc28c5\.com|58ad0086-1cfb-48bb-8ad2-33a8905572bc@5715d2be-69b9-4930-8f7e-64bdeb961cfd\.com)$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i224" id="{336D0C35-8A85-403a-B9D2-65C292C39087}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i61" id="youtube(a)youtube3.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <versionRange minVersion="0" maxVersion="*"> + <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i517" id="/^({16e193c8-1706-40bf-b6f3-91403a9a22be}|{284fed43-2e13-4afe-8aeb-50827d510e20}|{5e3cc5d8-ed11-4bed-bc47-35b4c4bc1033}|{7429e64a-1fd4-4112-a186-2b5630816b91}|{8c9980d7-0f09-4459-9197-99b3e559660c}|{8f1d9545-0bb9-4583-bb3c-5e1ac1e2920c})$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i509" id="contato(a)facefollow.net"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i372" id="5nc3QHFgcb(a)r06Ws9gvNNVRfH.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i496" id="{ACAA314B-EEBA-48e4-AD47-84E31C44796C}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i67" id="youtube2(a)youtube2.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i476" id="mbroctone(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i70" id="psid-vhvxQHMZBOzUZA@jetpack"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i473" id="{81b13b5d-fba1-49fd-9a6b-189483ac548a}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i437" id="{4933189D-C7F7-4C6E-834B-A29F087BFD23}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i394" id="{7D4F1959-3F72-49d5-8E59-F02F8AA6815D}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> + </prefs> + </emItem> + <emItem blockID="i402" id="{99079a25-328f-4bd4-be04-00955acaa0a7}"> + <versionRange minVersion="0.1" maxVersion="4.3.1.00" severity="1"> + </versionRange> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> </prefs> </emItem> <emItem blockID="i165" id="{EEF73632-A085-4fd3-A778-ECD82C8CB297}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i60" id="youtb3(a)youtb3.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> + </prefs> + </emItem> + <emItem blockID="i662" id="imbaty(a)taringamp3.com"> + <versionRange minVersion="0" maxVersion="*" severity="3"> + </versionRange> + <prefs> </prefs> </emItem> <emItem blockID="i546" id="firefox(a)browsefox.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i510" id="{3c9a72a0-b849-40f3-8c84-219109c27554}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i23" id="firefox(a)bandoo.com"> @@ -1608,85 +1696,89 @@ <versionRange minVersion="3.7a1pre" maxVersion="*" /> </targetApplication> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i55" id="youtube(a)youtube7.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i434" id="afurladvisor(a)anchorfree.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i90" id="videoplugin(a)player.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i489" id="astrovia(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i497" id="{872b5b88-9db5-4310-bdd0-ac189557e5f5}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i580" id="{51c77233-c0ad-4220-8388-47c11c18b355}"> <versionRange minVersion="0" maxVersion="0.1.9999999" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i541" id="/^({988919ff-0cd8-4d0c-bc7e-60d55a49eb64}|{494b9726-9084-415c-a499-68c07e187244}|{55b95864-3251-45e9-bb30-1a82589aaff1}|{eef3855c-fc2d-41e6-8d91-d368f51b3055}|{90a1b331-c2b4-4933-9f63-ba7b84d60d58}|{d2cf9842-af95-48cd-b873-bfbb48cd7f5e})$/"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i76" id="crossriderapp3924(a)crossrider.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> - <emItem blockID="i445" id="firefoxaddon(a)youtubeenhancer.com"> + <emItem blockID="i648" id="firefoxaddon(a)youtubeenhancer.com"> <versionRange minVersion="208.7.0" maxVersion="208.7.0" severity="3"> </versionRange> - <prefs> + <versionRange minVersion="199.7.0" maxVersion="199.7.0" severity="3"> + </versionRange> + <versionRange minVersion="199.7.0" maxVersion="208.7.0" severity="3"> + </versionRange> + <prefs> </prefs> </emItem> <emItem blockID="i441" id="{49c53dce-afa0-49a1-a08b-2eb8e8444128}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i508" id="advance(a)windowsclient.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i282" id="{33e0daa6-3af3-d8b5-6752-10e949c61516}"> <versionRange minVersion="0" maxVersion="1.1.999" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i452" id="{77beece6-3997-403a-92fa-0055bfcf88e5}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i45" id="{22119944-ED35-4ab1-910B-E619EA06A115}"> @@ -1695,71 +1787,71 @@ <versionRange minVersion="8.0a1" maxVersion="*" /> </targetApplication> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i82" id="{8f42fb8b-b6f6-45de-81c0-d6d39f54f971}"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i380" id="{cc8f597b-0765-404e-a575-82aefbd81daf}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i322" id="jid0-Y6TVIzs0r7r4xkOogmJPNAGFGBw@jetpack"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i378" id="{a7aae4f0-bc2e-a0dd-fb8d-68ce32c9261f}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i73" id="a1g0a9g219d(a)a1.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i96" id="youtubeee(a)youtuber3.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i163" id="info(a)allpremiumplay.info"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i455" id="7d51fb17-b199-4d8f-894e-decaff4fc36a(a)a298838b-7f50-4c7c-9277-df6abbd42a0c.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i374" id="update(a)firefox.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i314" id="crossriderapp8812(a)crossrider.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> - <prefs> + <prefs> </prefs> </emItem> <emItem blockID="i21" id="support(a)update-firefox.com"> - <prefs> + <prefs> </prefs> </emItem> </emItems> @@ -1771,446 +1863,446 @@ <versionRange minVersion="3.0a1" maxVersion="3.*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p27"> <match name="name" exp="QuickTime Plug-in 7[.]1[.]" /> <match name="filename" exp="npqtplugin.?[.]dll" /> <versionRange > <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="3.0a1" maxVersion="3.*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p28"> - <match name="filename" exp="NPFFAddOn.dll" /> </pluginItem> + <match name="filename" exp="NPFFAddOn.dll" /> </pluginItem> <pluginItem blockID="p31"> - <match name="filename" exp="NPMySrch.dll" /> </pluginItem> + <match name="filename" exp="NPMySrch.dll" /> </pluginItem> <pluginItem blockID="p32"> <match name="filename" exp="npViewpoint.dll" /> <versionRange > <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="3.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p33"> <match name="name" exp="[0-6]\.0\.[01]\d{2}\.\d+" /> <match name="filename" exp="npdeploytk.dll" /> <versionRange severity="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p34"> <match name="filename" exp="[Nn][Pp][Jj][Pp][Ii]1[56]0_[0-9]+\.[Dd][Ll][Ll]" /> <versionRange > <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="3.6a1pre" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p80"> <match name="name" exp="$TM$" /> <match name="description" exp="[^\d\._]((0(\.\d+(\.\d+([_\.]\d+)?)?)?)|(1\.(([0-5](\.\d+([_\.]\d+)?)?)|(6(\.0([_\.](0?\d|1\d|2\d|30))?)?)|(7(\.0([_\.][0-2])?)?))))([^\d\._]|$)" /> <match name="filename" exp="(npjp2\.dll)|(libnpjp2\.so)" /> <versionRange severity="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p85"> <match name="filename" exp="JavaPlugin2_NPAPI\.plugin" /> <versionRange minVersion="0" maxVersion="13.6.0" severity="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem os="Darwin" blockID="p89"> <match name="filename" exp="AdobePDFViewerNPAPI\.plugin" /> <versionRange minVersion="0" maxVersion="10.1.3" severity="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p94"> <match name="filename" exp="Flash\ Player\.plugin" /> <versionRange minVersion="0" maxVersion="10.2.159.1" severity="0"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="0.1" maxVersion="17.0.1" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p102"> <match name="filename" exp="npmozax\.dll" /> <versionRange minVersion="0" maxVersion="*"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p113"> <match name="filename" exp="npuplaypc\.dll" /> <versionRange minVersion="0" maxVersion="1.0.0.0" severity="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p119"> <match name="name" exp="Java$TM$ Plug-in 1\.(6\.0_(\d|[0-2]\d?|3[0-2])|7\.0(_0?([1-4]))?)([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="0.1" maxVersion="17.*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p123"> <match name="filename" exp="JavaPlugin2_NPAPI\.plugin" /> <versionRange minVersion="0" maxVersion="14.2.0" severity="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="0.1" maxVersion="17.*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p125"> <match name="name" exp="Java$TM$ Platform SE ((6( U(\d|([0-2]\d)|3[0-2]))?)|(7(\sU[0-4])?))(\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="0.1" maxVersion="17.*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p129"> <match name="filename" exp="Silverlight\.plugin" /> <versionRange minVersion="0" maxVersion="5.0.99999" severity="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p132"> <match name="name" exp="Java$TM$ Plug-in 1\.7\.0(_0?([5-6]))?([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="0.1" maxVersion="17.*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p134"> <match name="name" exp="Java$TM$ Platform SE 7 U[5-6](\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="0.1" maxVersion="17.*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p138"> <match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 7 Update 01" maxVersion="Java 7 Update 06" severity="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="0.1" maxVersion="17.*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p152"> <match name="filename" exp="npctrl\.dll" /> <versionRange minVersion="0" maxVersion="4.1.10328.0" severity="0" vulnerabilitystatus="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p154"> <match name="filename" exp="npctrl\.dll" /> <versionRange minVersion="5.0" maxVersion="5.1.20124.9999" severity="0" vulnerabilitystatus="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p156"> <match name="filename" exp="nppdf32\.dll" /> <versionRange minVersion="0" maxVersion="9.5.1" severity="0" vulnerabilitystatus="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p158"> <match name="filename" exp="nppdf32\.dll" /> <versionRange minVersion="10.0" maxVersion="10.1.5.9999" severity="0" vulnerabilitystatus="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p160"> <match name="filename" exp="NPSWF32\.dll" /> <versionRange minVersion="0" maxVersion="10.2.9999" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="4.0" maxVersion="16.*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p176"> <match name="filename" exp="(NPSWF32\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="10.3" maxVersion="10.3.183.18.999" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="19.0a1" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p176"> <match name="filename" exp="(NPSWF32\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="10.3" maxVersion="10.3.183.18.999" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0.4" maxVersion="17.0.*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p178"> <match name="filename" exp="(NPSWF[0-9_]*\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="11.0" maxVersion="11.7.700.169" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="19.0a1" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p178"> <match name="filename" exp="(NPSWF[0-9_]*\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="11.0" maxVersion="11.7.700.169" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0.4" maxVersion="17.0.*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p180"> <match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 7 Update 0" maxVersion="Java 7 Update 11" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p182"> <match name="name" exp="Java$TM$ Platform SE 7 U([0-9]|(1[0-1]))(\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p184"> <match name="name" exp="Java$TM$ Plug-in 1\.7\.0(_0?([0-9]|(1[0-1]))?)?([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p186"> <match name="name" exp="Java$TM$ Platform SE 6 U3[1-8](\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p188"> <match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 6 Update 0" maxVersion="Java 6 Update 38" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p190"> <match name="name" exp="Java$TM$ Plug-in 1\.6\.0_3[1-8]([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p210"> <match name="name" exp="Java$TM$ Plug-in 1\.7\.0(_0?7)?([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="0.1" maxVersion="17.*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p212"> <match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 7 Update 07" maxVersion="Java 7 Update 07" severity="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="0.1" maxVersion="17.*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p214"> <match name="name" exp="Java$TM$ Platform SE 7 U7(\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="0.1" maxVersion="17.*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p240"> <match name="filename" exp="DivXBrowserPlugin\.plugin" /> <versionRange minVersion="0" maxVersion="1.4" severity="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem os="Darwin" blockID="p242"> <match name="description" exp="Flip4Mac" /> <versionRange minVersion="0" maxVersion="2.4.3.999" severity="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="18.0a1" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p248"> <match name="filename" exp="Scorch\.plugin" /> <versionRange minVersion="0" maxVersion="6.2.0b88" severity="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p250"> <match name="filename" exp="npFoxitReaderPlugin\.dll" /> <versionRange minVersion="0" maxVersion="2.2.1.530" severity="0" vulnerabilitystatus="2"></versionRange> - </pluginItem> + </pluginItem> <pluginItem os="Darwin" blockID="p252"> <match name="filename" exp="AdobePDFViewerNPAPI\.plugin" /> <versionRange minVersion="11.0.0" maxVersion="11.0.01" severity="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p254"> <match name="filename" exp="PDF Browser Plugin\.plugin" /> <versionRange minVersion="0" maxVersion="2.4.2" severity="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="18.0a1" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p260"> <match name="filename" exp="(NPSWF32\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="0" maxVersion="10.2.9999" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="18.0a1" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p260"> <match name="filename" exp="(NPSWF32\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="0" maxVersion="10.2.9999" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0.4" maxVersion="17.0.*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p290"> <match name="filename" exp="(NPSWF32\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="10.3.183.19" maxVersion="10.3.183.66" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="19.0a1" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p290"> <match name="filename" exp="(NPSWF32\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="10.3.183.19" maxVersion="10.3.183.66" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0.4" maxVersion="17.0.*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p292"> <match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 7 Update 12" maxVersion="Java 7 Update 15" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p294"> <match name="name" exp="Java$TM$ Platform SE 7 U1[2-5](\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p296"> <match name="name" exp="Java$TM$ Plug-in 1\.7\.0_1[2-5]([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p298"> <match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 6 Update 39" maxVersion="Java 6 Update 41" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p300"> <match name="name" exp="Java$TM$ Platform SE 6 U(39|40|41)(\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p302"> <match name="name" exp="Java$TM$ Plug-in 1\.6\.0_(39|40|41)([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p328"> <match name="filename" exp="Silverlight\.plugin" /> <versionRange minVersion="5.1" maxVersion="5.1.20124.9999" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="19.0a1" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p328"> <match name="filename" exp="Silverlight\.plugin" /> <versionRange minVersion="5.1" maxVersion="5.1.20124.9999" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0.4" maxVersion="17.0.*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p330"> <match name="description" exp="^Shockwave Flash (([1-9]\.[0-9]+)|(10\.([0-2]|(3 r(([0-9][0-9]?)|1(([0-7][0-9])|8[0-2]))))))( |$)" /> <match name="filename" exp="libflashplayer\.so" /> <versionRange severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="19.0a1" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p330"> <match name="description" exp="^Shockwave Flash (([1-9]\.[0-9]+)|(10\.([0-2]|(3 r(([0-9][0-9]?)|1(([0-7][0-9])|8[0-2]))))))( |$)" /> <match name="filename" exp="libflashplayer\.so" /> <versionRange severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0.4" maxVersion="17.0.*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p332"> <match name="description" exp="^Shockwave Flash 11.(0|1) r[0-9]{1,3}$" /> <match name="filename" exp="libflashplayer\.so" /> <versionRange severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="19.0a1" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p332"> <match name="description" exp="^Shockwave Flash 11.(0|1) r[0-9]{1,3}$" /> <match name="filename" exp="libflashplayer\.so" /> <versionRange severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0.4" maxVersion="17.0.*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p366"> <match name="filename" exp="Scorch\.plugin" /> <versionRange minVersion="6.2.0" maxVersion="6.2.0" severity="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p408"> <match name="filename" exp="QuickTime Plugin\.plugin" /> <versionRange minVersion="0" maxVersion="7.6.5" severity="0" vulnerabilitystatus="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p410"> <match name="filename" exp="npqtplugin\.dll" /> <versionRange minVersion="0" maxVersion="7.7.3" severity="0" vulnerabilitystatus="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p412"> <match name="name" exp="Java$TM$ Plug-in 1\.6\.0_4[2-5]([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p414"> <match name="name" exp="Java$TM$ Platform SE 6 U4[2-5](\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p416"> <match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 6 Update 42" maxVersion="Java 6 Update 45" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p418"> <match name="name" exp="Java$TM$ Plug-in 1\.7\.0_(1[6-9]|2[0-4])([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p420"> <match name="name" exp="Java$TM$ Platform SE 7 U(1[6-9]|2[0-4])(\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p422"> <match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 7 Update 16" maxVersion="Java 7 Update 24" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p428"> <match name="filename" exp="np[dD]eployJava1\.dll" /> <versionRange severity="0" vulnerabilitystatus="2"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p456"> <match name="filename" exp="npvlc\.dll" /> <versionRange minVersion="0" maxVersion="2.0.5" severity="0" vulnerabilitystatus="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p457"> <match name="name" exp="Java($TM$)? Plug-in ((1\.7\.0_(2[5-9]|3\d|4[0-4]))|(10\.4[0-4](\.[0-9]+)?))([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p458"> <match name="name" exp="Java$TM$ Platform SE 7 U(2[5-9]|3\d|4[0-4])(\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p459"> <match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 7 Update 25" maxVersion="Java 7 Update 44" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p556"> <match name="filename" exp="npUnity3D32\.dll" /> <versionRange minVersion="0" maxVersion="4.3.4.99999999" severity="0" vulnerabilitystatus="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p558"> <match name="description" exp="^($|Unity Web Player version ([0-3]|(4\.([0-2]|3(\.[0-4])?[^0-9.]))))" /> <match name="filename" exp="Unity Web Player\.plugin" /> <versionRange severity="0" vulnerabilitystatus="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p572"> <match name="filename" exp="npdjvu\.dll" /> <versionRange minVersion="0" maxVersion="6.1.4.27993" severity="0" vulnerabilitystatus="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p574"> <match name="filename" exp="NPDjVu\.plugin" /> <versionRange minVersion="0" maxVersion="6.1.1" severity="0" vulnerabilitystatus="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p592"> <match name="filename" exp="CiscoWebCommunicator\.plugin" /> <versionRange minVersion="0" maxVersion="3.0.5.99999999999999" severity="0" vulnerabilitystatus="1"></versionRange> - </pluginItem> + </pluginItem> <pluginItem blockID="p594"> <match name="filename" exp="npCiscoWebCommunicator\.dll" /> <versionRange minVersion="0" maxVersion="3.0.5.99999999999999" severity="0" vulnerabilitystatus="1"></versionRange> - </pluginItem> + </pluginItem> </pluginItems> <gfxItems>

1 0

[tor-browser/esr24] No bug, Automated HSTS preload list update from host bld-linux64-spot-1024 - a=hsts-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 980d4b6439ecb5d1044772302be6f3b564c86585 Author: ffxbld <none@none> Date: Sat Jun 14 03:12:44 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-1024 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 13 ++++++------- security/manager/boot/src/nsSTSPreloadList.inc | 19 ++++++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index f04dcfb..7d18d22 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -1,22 +1,22 @@ admin.google.com: did not receive HSTS header adsfund.org: could not connect to host airbnb.com: did not receive HSTS header -alpha.irccloud.com: could not connect to host +alpha.irccloud.com: did not receive HSTS header anycoin.me: did not receive HSTS header api.lookout.com: could not connect to host api.mega.co.nz: could not connect to host api.recurly.com: did not receive HSTS header -api.simple.com: did not receive HSTS header apis.google.com: did not receive HSTS header app.lookout.com: could not connect to host appengine.google.com: did not receive HSTS header -appseccalifornia.org: could not connect to host +appseccalifornia.org: did not receive HSTS header bassh.net: did not receive HSTS header bcrook.com: max-age too low: 86400 betnet.fr: could not connect to host bigshinylock.minazo.net: could not connect to host blacklane.com: did not receive HSTS header braintreegateway.com: did not receive HSTS header +braintreepayments.com: did not receive HSTS header browserid.org: did not receive HSTS header business.medbank.com.mt: did not receive HSTS header carlolly.co.uk: did not receive HSTS header @@ -42,10 +42,10 @@ edmodo.com: did not receive HSTS header email.lookout.com: could not connect to host emailprivacytester.com: did not receive HSTS header encrypted.google.com: did not receive HSTS header +epoxate.com: did not receive HSTS header errors.zenpayroll.com: could not connect to host espra.com: could not connect to host fatzebra.com.au: did not receive HSTS header -fj.simple.com: did not receive HSTS header get.zenpayroll.com: did not receive HSTS header glass.google.com: did not receive HSTS header gmail.com: did not receive HSTS header @@ -90,6 +90,7 @@ play.google.com: did not receive HSTS header prodpad.com: did not receive HSTS header profiles.google.com: did not receive HSTS header rapidresearch.me: did not receive HSTS header +riseup.net: did not receive HSTS header sah3.net: could not connect to host saturngames.co.uk: did not receive HSTS header script.google.com: did not receive HSTS header @@ -108,7 +109,6 @@ spreadsheets.google.com: did not receive HSTS header square.com: did not receive HSTS header ssl.google-analytics.com: did not receive HSTS header ssl.panoramio.com: did not receive HSTS header -stage.wepay.com: max-age too low: 2592000 static.wepay.com: did not receive HSTS header sunshinepress.org: could not connect to host surfeasy.com: did not receive HSTS header @@ -117,8 +117,8 @@ talkgadget.google.com: did not receive HSTS header translate.googleapis.com: did not receive HSTS header uprotect.it: could not connect to host wallet.google.com: did not receive HSTS header +waveapps.com: no error webmail.mayfirst.org: did not receive HSTS header -wepay.com: max-age too low: 2592000 whonix.org: did not receive HSTS header www.cueup.com: did not receive HSTS header www.developer.mydigipass.com: could not connect to host @@ -138,5 +138,4 @@ www.paypal.com: max-age too low: 14400 www.roddis.net: did not receive HSTS header www.sandbox.mydigipass.com: could not connect to host www.surfeasy.com: did not receive HSTS header -www.wepay.com: max-age too low: 2592000 zoo24.de: max-age too low: 2592000 diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index d2f42c6..2e204ef 100644 --- a/security/manager/boot/src/nsSTSPreloadList.inc +++ b/security/manager/boot/src/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/ #include "mozilla/StandardInteger.h" -const PRTime gPreloadListExpirationTime = INT64_C(1412417180147000); +const PRTime gPreloadListExpirationTime = INT64_C(1413626792852000); class nsSTSPreload { @@ -23,13 +23,12 @@ static const nsSTSPreload kSTSPreloadList[] = { { "activiti.alfresco.com", false }, { "adsfund.org", true }, { "aladdinschools.appspot.com", false }, - { "alpha.irccloud.com", false }, { "api.intercom.io", false }, + { "api.simple.com", false }, { "api.xero.com", false }, { "app.manilla.com", true }, { "app.recurly.com", false }, { "app.yinxiang.com", false }, - { "appseccalifornia.org", true }, { "arivo.com.br", true }, { "bank.simple.com", false }, { "bccx.com", true }, @@ -39,7 +38,6 @@ static const nsSTSPreload kSTSPreloadList[] = { { "blog.lookout.com", false }, { "blog.torproject.org", false }, { "boxcryptor.com", true }, - { "braintreepayments.com", false }, { "bugzilla.mozilla.org", true }, { "business.lookout.com", false }, { "calyxinstitute.org", false }, @@ -73,7 +71,6 @@ static const nsSTSPreload kSTSPreloadList[] = { { "eff.org", true }, { "encircleapp.com", true }, { "entropia.de", false }, - { "epoxate.com", false }, { "errors.zenpayroll.com", false }, { "espra.com", true }, { "f-droid.org", true }, @@ -82,6 +79,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "faq.lookout.com", false }, { "feedbin.com", false }, { "fiken.no", true }, + { "fj.simple.com", false }, { "forum.linode.com", false }, { "forum.quantifiedself.com", true }, { "gernert-server.de", true }, @@ -96,6 +94,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "heha.co", true }, { "howrandom.org", true }, { "id.mayfirst.org", false }, + { "imouto.my", false }, { "inertianetworks.com", true }, { "intercom.io", false }, { "itriskltd.com", true }, @@ -132,6 +131,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "mega.co.nz", false }, { "members.mayfirst.org", false }, { "members.nearlyfreespeech.net", false }, + { "miku.hatsune.my", true }, { "mnsure.org", true }, { "mobile.usaa.com", false }, { "mudcrab.us", true }, @@ -167,10 +167,11 @@ static const nsSTSPreload kSTSPreloadList[] = { { "pult.co", true }, { "pypi.python.org", true }, { "python.org", false }, - { "riseup.net", true }, + { "reviews.anime.my", true }, { "roddis.net", false }, { "romab.com", true }, { "roundcube.mayfirst.org", false }, + { "sakaki.anime.my", true }, { "sandbox.mydigipass.com", false }, { "securityheaders.com", true }, { "seifried.org", true }, @@ -180,6 +181,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "simple.com", false }, { "skydrive.live.com", false }, { "squareup.com", false }, + { "stage.wepay.com", false }, { "stocktrade.de", false }, { "stripe.com", true }, { "strongest-privacy.com", true }, @@ -194,14 +196,16 @@ static const nsSTSPreload kSTSPreloadList[] = { { "ubertt.org", true }, { "usaa.com", false }, { "vmoagents.com", false }, + { "vocaloid.my", true }, { "w-spotlight.appspot.com", true }, - { "waveapps.com", true }, + { "webcollect.org.uk", true }, { "webfilings-eu-mirror.appspot.com", true }, { "webfilings-eu.appspot.com", true }, { "webfilings-mirror-hrd.appspot.com", true }, { "webfilings.appspot.com", true }, { "webmail.gigahost.dk", false }, { "webmail.onlime.ch", false }, + { "wepay.com", false }, { "wf-bigsky-master.appspot.com", true }, { "wf-demo-eu.appspot.com", true }, { "wf-demo-hrd.appspot.com", true }, @@ -245,6 +249,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "www.torproject.org", false }, { "www.twitter.com", false }, { "www.usaa.com", false }, + { "www.wepay.com", false }, { "www.zenpayroll.com", false }, { "xbrlsuccess.appspot.com", true }, { "zenpayroll.com", false },

1 0

[tor-browser/esr24] Bug 1019684 - Turn an assert into a release mode crash instead. r=mjrosenb, a=dveditz
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit b662bbc824cf22db8ca20521bf6eb12ca592da70 Author: Brian Hackett <bhackett1024(a)gmail.com> Date: Thu Jun 12 09:11:00 2014 -0400 Bug 1019684 - Turn an assert into a release mode crash instead. r=mjrosenb, a=dveditz --- js/src/jit/arm/Assembler-arm.cpp | 4 ++-- js/src/jit/arm/Assembler-arm.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/js/src/jit/arm/Assembler-arm.cpp b/js/src/jit/arm/Assembler-arm.cpp index 9969d22..9746521 100644 --- a/js/src/jit/arm/Assembler-arm.cpp +++ b/js/src/jit/arm/Assembler-arm.cpp @@ -1852,7 +1852,7 @@ Assembler::as_b(Label *l, Condition c, bool isPatchable) // This will currently throw an assertion if we couldn't actually // encode the offset of the branch. if (!BOffImm::isInRange(old)) { - m_buffer.bail(); + m_buffer.fail_bail(); return ret; } ret = as_b(BOffImm(old), c, isPatchable); @@ -1915,7 +1915,7 @@ Assembler::as_bl(Label *l, Condition c) // encode the offset of the branch. old = l->offset(); if (!BOffImm::isInRange(old)) { - m_buffer.bail(); + m_buffer.fail_bail(); return ret; } ret = as_bl(BOffImm(old), c); diff --git a/js/src/jit/arm/Assembler-arm.h b/js/src/jit/arm/Assembler-arm.h index 7af98dc..f33c2bc 100644 --- a/js/src/jit/arm/Assembler-arm.h +++ b/js/src/jit/arm/Assembler-arm.h @@ -975,7 +975,8 @@ class BOffImm : data ((offset - 8) >> 2 & 0x00ffffff) { JS_ASSERT((offset & 0x3) == 0); - JS_ASSERT(isInRange(offset)); + if (!isInRange(offset)) + CrashAtUnhandlableOOM("BOffImm"); } static bool isInRange(int offset) {

1 0

[tor-browser/esr24] Bug 919592 - Ionmonkey (ARM): Guard against branches being out of range and bail out of compilation if so. r=mjrosenb, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit a248a86571775fc8c25d29e90cf015cfc7b34358 Author: Douglas Crosher <dtc-moz(a)scieneer.com> Date: Fri Mar 21 14:27:31 2014 +1100 Bug 919592 - Ionmonkey (ARM): Guard against branches being out of range and bail out of compilation if so. r=mjrosenb, a=sledru --- js/src/jit/arm/Assembler-arm.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/js/src/jit/arm/Assembler-arm.cpp b/js/src/jit/arm/Assembler-arm.cpp index 57a3aa2..9969d22 100644 --- a/js/src/jit/arm/Assembler-arm.cpp +++ b/js/src/jit/arm/Assembler-arm.cpp @@ -1851,6 +1851,10 @@ Assembler::as_b(Label *l, Condition c, bool isPatchable) old = l->offset(); // This will currently throw an assertion if we couldn't actually // encode the offset of the branch. + if (!BOffImm::isInRange(old)) { + m_buffer.bail(); + return ret; + } ret = as_b(BOffImm(old), c, isPatchable); } else { old = LabelBase::INVALID_OFFSET; @@ -1910,6 +1914,10 @@ Assembler::as_bl(Label *l, Condition c) // This will currently throw an assertion if we couldn't actually // encode the offset of the branch. old = l->offset(); + if (!BOffImm::isInRange(old)) { + m_buffer.bail(); + return ret; + } ret = as_bl(BOffImm(old), c); } else { old = LabelBase::INVALID_OFFSET;

1 0

[tor-browser/esr24] Bug 1019684 - Follow-up bustage fix. r=jandem, a=bustage
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 8aa5416d9797a6ebbf682780ea26882d08095284 Author: Ryan VanderMeulen <ryanvm(a)gmail.com> Date: Tue Jun 17 13:15:22 2014 -0400 Bug 1019684 - Follow-up bustage fix. r=jandem, a=bustage --- js/src/jit/arm/Assembler-arm.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/js/src/jit/arm/Assembler-arm.h b/js/src/jit/arm/Assembler-arm.h index f33c2bc..1bc314a 100644 --- a/js/src/jit/arm/Assembler-arm.h +++ b/js/src/jit/arm/Assembler-arm.h @@ -18,6 +18,8 @@ #include "jit/arm/Architecture-arm.h" #include "jit/shared/IonAssemblerBufferWithConstantPools.h" +#include "jsprf.h" + namespace js { namespace jit { @@ -957,6 +959,15 @@ class VFPImm { } }; +inline void +AssemblerCrashAtUnhandlableOOM(const char *reason) +{ + char msgbuf[1024]; + JS_snprintf(msgbuf, sizeof(msgbuf), "[unhandlable oom] %s", reason); + MOZ_ReportAssertionFailure(msgbuf, __FILE__, __LINE__); + MOZ_CRASH(); +} + // A BOffImm is an immediate that is used for branches. Namely, it is the offset that will // be encoded in the branch instruction. This is the only sane way of constructing a branch. class BOffImm @@ -976,7 +987,7 @@ class BOffImm { JS_ASSERT((offset & 0x3) == 0); if (!isInRange(offset)) - CrashAtUnhandlableOOM("BOffImm"); + AssemblerCrashAtUnhandlableOOM("BOffImm"); } static bool isInRange(int offset) {

1 0

[tor-browser/esr24] Bug 995603 - Ensure mouse-enter/exit events are sent to plugins as appropriate. r=mstange a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 94b845556474e198effe7a2d6fe7e1bc0bd1f729 Author: Steven Michaud <smichaud(a)pobox.com> Date: Wed Jun 18 11:13:35 2014 -0500 Bug 995603 - Ensure mouse-enter/exit events are sent to plugins as appropriate. r=mstange a=abillings --- content/events/src/nsContentEventHandler.cpp | 25 ++++++-- content/events/src/nsContentEventHandler.h | 2 +- widget/cocoa/nsChildView.mm | 81 +++++++++----------------- widget/cocoa/nsCocoaWindow.h | 3 - widget/cocoa/nsCocoaWindow.mm | 30 ---------- 5 files changed, 48 insertions(+), 93 deletions(-) diff --git a/content/events/src/nsContentEventHandler.cpp b/content/events/src/nsContentEventHandler.cpp index 8b151cb..e989535 100644 --- a/content/events/src/nsContentEventHandler.cpp +++ b/content/events/src/nsContentEventHandler.cpp @@ -44,11 +44,8 @@ nsContentEventHandler::nsContentEventHandler( } nsresult -nsContentEventHandler::InitCommon() +nsContentEventHandler::InitBasic() { - if (mSelection) - return NS_OK; - NS_ENSURE_TRUE(mPresShell, NS_ERROR_NOT_AVAILABLE); // If text frame which has overflowing selection underline is dirty, @@ -58,11 +55,24 @@ nsContentEventHandler::InitCommon() // Flushing notifications can cause mPresShell to be destroyed (bug 577963). NS_ENSURE_TRUE(!mPresShell->IsDestroying(), NS_ERROR_FAILURE); + return NS_OK; +} + +nsresult +nsContentEventHandler::InitCommon() +{ + if (mSelection) { + return NS_OK; + } + + nsresult rv = InitBasic(); + NS_ENSURE_SUCCESS(rv, rv); + nsCopySupport::GetSelectionForCopy(mPresShell->GetDocument(), getter_AddRefs(mSelection)); nsCOMPtr<nsIDOMRange> firstRange; - nsresult rv = mSelection->GetRangeAt(0, getter_AddRefs(firstRange)); + rv = mSelection->GetRangeAt(0, getter_AddRefs(firstRange)); // This shell doesn't support selection. if (NS_FAILED(rv)) return NS_ERROR_NOT_AVAILABLE; @@ -860,10 +870,13 @@ nsContentEventHandler::OnQueryCharacterAtPoint(nsQueryContentEvent* aEvent) nsresult nsContentEventHandler::OnQueryDOMWidgetHittest(nsQueryContentEvent* aEvent) { - nsresult rv = Init(aEvent); + NS_ASSERTION(aEvent, "aEvent must not be null"); + + nsresult rv = InitBasic(); if (NS_FAILED(rv)) return rv; + aEvent->mSucceeded = false; aEvent->mReply.mWidgetIsHit = false; NS_ENSURE_TRUE(aEvent->widget, NS_ERROR_FAILURE); diff --git a/content/events/src/nsContentEventHandler.h b/content/events/src/nsContentEventHandler.h index 4c4f492..1624d35 100644 --- a/content/events/src/nsContentEventHandler.h +++ b/content/events/src/nsContentEventHandler.h @@ -66,7 +66,7 @@ protected: nsresult Init(nsQueryContentEvent* aEvent); nsresult Init(nsSelectionEvent* aEvent); - // InitCommon() is called from each Init(). + nsresult InitBasic(); nsresult InitCommon(); public: diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index aef01c7..9d99be9 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -2790,6 +2790,34 @@ NSEvent* gLastDragMouseDownEvent = nil; return mIsPluginView; } +- (NSView *)hitTest:(NSPoint)aPoint +{ + NSView* target = [super hitTest:aPoint]; + NSWindow *window = [self window]; + if (window && (target == self) && [self isPluginView] && mGeckoChild) { + nsAutoRetainCocoaObject kungFuDeathGrip(self); + + NSPoint windowLoc = [[self superview] convertPoint:aPoint toView:nil]; + NSPoint screenLoc = [window convertBaseToScreen:windowLoc]; + screenLoc.y = nsCocoaUtils::FlippedScreenY(screenLoc.y); + nsIntPoint widgetLoc = mGeckoChild->CocoaPointsToDevPixels(screenLoc) - + mGeckoChild->WidgetToScreenOffset(); + + nsQueryContentEvent hitTest(true, NS_QUERY_DOM_WIDGET_HITTEST, + mGeckoChild); + hitTest.InitForQueryDOMWidgetHittest(widgetLoc); + // This might destroy our widget. + mGeckoChild->DispatchWindowEvent(hitTest); + if (!mGeckoChild) { + return nil; + } + if (hitTest.mSucceeded && !hitTest.mReply.mWidgetIsHit) { + return nil; + } + } + return target; +} + // Are we processing an NSLeftMouseDown event that will fail to click through? // If so, we shouldn't focus or unfocus a plugin. - (BOOL)isInFailingLeftClickThrough @@ -4913,65 +4941,12 @@ static int32_t RoundUp(double aDouble) return !mGeckoChild->DispatchWindowEvent(geckoEvent); } -// Don't focus a plugin if the user has clicked on a DOM element above it. -// In this case the user has actually clicked on the plugin's ChildView -// (underneath the non-plugin DOM element). But we shouldn't allow the -// ChildView to be focused. See bug 627649. -- (BOOL)currentEventShouldFocusPlugin -{ - if (!mGeckoChild) - return NO; - - NSEvent* currentEvent = [NSApp currentEvent]; - if ([currentEvent type] != NSLeftMouseDown) - return YES; - - nsAutoRetainCocoaObject kungFuDeathGrip(self); - - // hitTest needs coordinates in device pixels - NSPoint eventLoc = nsCocoaUtils::ScreenLocationForEvent(currentEvent); - eventLoc.y = nsCocoaUtils::FlippedScreenY(eventLoc.y); - nsIntPoint widgetLoc = mGeckoChild->CocoaPointsToDevPixels(eventLoc) - - mGeckoChild->WidgetToScreenOffset(); - - nsQueryContentEvent hitTest(true, NS_QUERY_DOM_WIDGET_HITTEST, mGeckoChild); - hitTest.InitForQueryDOMWidgetHittest(widgetLoc); - // This might destroy our widget (and null out mGeckoChild). - mGeckoChild->DispatchWindowEvent(hitTest); - if (!mGeckoChild) - return NO; - if (hitTest.mSucceeded && !hitTest.mReply.mWidgetIsHit) - return NO; - - return YES; -} - -// Don't focus a plugin if we're in a left click-through that will fail (see -// [ChildView isInFailingLeftClickThrough] above). -- (BOOL)shouldFocusPlugin:(BOOL)getFocus -{ - if (!mGeckoChild) - return NO; - - nsCocoaWindow* windowWidget = mGeckoChild->GetXULWindowWidget(); - if (windowWidget && !windowWidget->ShouldFocusPlugin()) - return NO; - - if (getFocus && ![self currentEventShouldFocusPlugin]) - return NO; - - return YES; -} - // Returns NO if the plugin shouldn't be focused/unfocused. - (BOOL)updatePluginFocusStatus:(BOOL)getFocus { if (!mGeckoChild) return NO; - if (![self shouldFocusPlugin:getFocus]) - return NO; - if (mPluginEventModel == NPEventModelCocoa) { nsPluginEvent pluginEvent(true, NS_PLUGIN_FOCUS_EVENT, mGeckoChild); NPCocoaEvent cocoaEvent; diff --git a/widget/cocoa/nsCocoaWindow.h b/widget/cocoa/nsCocoaWindow.h index ac434e0..dc5994671 100644 --- a/widget/cocoa/nsCocoaWindow.h +++ b/widget/cocoa/nsCocoaWindow.h @@ -316,9 +316,6 @@ public: void SetPopupWindowLevel(); - bool IsChildInFailingLeftClickThrough(NSView *aChild); - bool ShouldFocusPlugin(); - NS_IMETHOD ReparentNativeWidget(nsIWidget* aNewParent); protected: diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm index b95c072..b435155 100644 --- a/widget/cocoa/nsCocoaWindow.mm +++ b/widget/cocoa/nsCocoaWindow.mm @@ -2051,36 +2051,6 @@ void nsCocoaWindow::SetPopupWindowLevel() } } -bool nsCocoaWindow::IsChildInFailingLeftClickThrough(NSView *aChild) -{ - if ([aChild isKindOfClass:[ChildView class]]) { - ChildView* childView = (ChildView*) aChild; - if ([childView isInFailingLeftClickThrough]) - return true; - } - NSArray* subviews = [aChild subviews]; - if (subviews) { - NSUInteger count = [subviews count]; - for (NSUInteger i = 0; i < count; ++i) { - NSView* aView = (NSView*) [subviews objectAtIndex:i]; - if (IsChildInFailingLeftClickThrough(aView)) - return true; - } - } - return false; -} - -// Don't focus a plugin if we're in a left click-through that will -// fail (see [ChildView isInFailingLeftClickThrough]). Called from -// [ChildView shouldFocusPlugin]. -bool nsCocoaWindow::ShouldFocusPlugin() -{ - if (!mWindow || IsChildInFailingLeftClickThrough([mWindow contentView])) - return false; - - return true; -} - NS_IMETHODIMP nsCocoaWindow::NotifyIME(NotificationToIME aNotification) {

1 0

[tor-browser/esr24] Bug 1019684 - Appease the style checker gods. r=jandem, a=orange
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 64e0c800366410debf70f1a9cf9f7ccc6c2490f0 Author: Ryan VanderMeulen <ryanvm(a)gmail.com> Date: Tue Jun 17 15:35:16 2014 -0400 Bug 1019684 - Appease the style checker gods. r=jandem, a=orange --- js/src/jit/arm/Assembler-arm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/src/jit/arm/Assembler-arm.h b/js/src/jit/arm/Assembler-arm.h index 1bc314a..e8a4442 100644 --- a/js/src/jit/arm/Assembler-arm.h +++ b/js/src/jit/arm/Assembler-arm.h @@ -11,6 +11,8 @@ #include "mozilla/MathAlgorithms.h" #include "mozilla/Util.h" +#include "jsprf.h" + #include "jit/shared/Assembler-shared.h" #include "assembler/assembler/AssemblerBufferWithConstantPool.h" #include "jit/CompactBuffer.h" @@ -18,8 +20,6 @@ #include "jit/arm/Architecture-arm.h" #include "jit/shared/IonAssemblerBufferWithConstantPools.h" -#include "jsprf.h" - namespace js { namespace jit {

1 0

[tor-browser/esr24] Bug 1023618 - Always call FlushRendering in the reftest harness. r=roc, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 9192077d0d22be236936c29a4a87a7d2246869a8 Author: Seth Fowler <seth(a)mozilla.com> Date: Wed Jun 11 20:21:08 2014 -0700 Bug 1023618 - Always call FlushRendering in the reftest harness. r=roc, a=test-only --- layout/tools/reftest/reftest-content.js | 51 +++++++++++++++++-------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/layout/tools/reftest/reftest-content.js b/layout/tools/reftest/reftest-content.js index 09ee3e2..efadf82 100644 --- a/layout/tools/reftest/reftest-content.js +++ b/layout/tools/reftest/reftest-content.js @@ -268,43 +268,45 @@ const STATE_WAITING_FOR_SPELL_CHECKS = 2; const STATE_WAITING_TO_FINISH = 3; const STATE_COMPLETED = 4; -function WaitForTestEnd(contentRootElement, inPrintMode, spellCheckedElements) { - var stopAfterPaintReceived = false; - var currentDoc = content.document; - var state = STATE_WAITING_TO_FIRE_INVALIDATE_EVENT; - - function FlushRendering() { - var anyPendingPaintsGeneratedInDescendants = false; +function FlushRendering() { + var anyPendingPaintsGeneratedInDescendants = false; - function flushWindow(win) { - var utils = win.QueryInterface(CI.nsIInterfaceRequestor) - .getInterface(CI.nsIDOMWindowUtils); - var afterPaintWasPending = utils.isMozAfterPaintPending; + function flushWindow(win) { + var utils = win.QueryInterface(CI.nsIInterfaceRequestor) + .getInterface(CI.nsIDOMWindowUtils); + var afterPaintWasPending = utils.isMozAfterPaintPending; + if (win.document.documentElement) { try { // Flush pending restyles and reflows for this window win.document.documentElement.getBoundingClientRect(); } catch (e) { LogWarning("flushWindow failed: " + e + "\n"); } + } - if (!afterPaintWasPending && utils.isMozAfterPaintPending) { - LogInfo("FlushRendering generated paint for window " + win.location.href); - anyPendingPaintsGeneratedInDescendants = true; - } + if (!afterPaintWasPending && utils.isMozAfterPaintPending) { + LogInfo("FlushRendering generated paint for window " + win.location.href); + anyPendingPaintsGeneratedInDescendants = true; + } - for (var i = 0; i < win.frames.length; ++i) { - flushWindow(win.frames[i]); - } + for (var i = 0; i < win.frames.length; ++i) { + flushWindow(win.frames[i]); } + } - flushWindow(content); + flushWindow(content); - if (anyPendingPaintsGeneratedInDescendants && - !windowUtils().isMozAfterPaintPending) { - LogWarning("Internal error: descendant frame generated a MozAfterPaint event, but the root document doesn't have one!"); - } + if (anyPendingPaintsGeneratedInDescendants && + !windowUtils().isMozAfterPaintPending) { + LogWarning("Internal error: descendant frame generated a MozAfterPaint event, but the root document doesn't have one!"); } +} + +function WaitForTestEnd(contentRootElement, inPrintMode, spellCheckedElements) { + var stopAfterPaintReceived = false; + var currentDoc = content.document; + var state = STATE_WAITING_TO_FIRE_INVALIDATE_EVENT; function AfterPaintListener(event) { LogInfo("AfterPaintListener in " + event.target.document.location.href); @@ -541,6 +543,9 @@ function OnDocumentLoad(event) var contentRootElement = content.document ? content.document.documentElement : null; + // Flush the document in case it got modified in a load event handler. + FlushRendering(); + // Take a snapshot now. We need to do this before we check whether // we should wait, since this might trigger dispatching of // MozPaintWait events and make shouldWaitForExplicitPaintWaiters() true

1 0

[tor-browser/esr24] Bug 913805 - Hold a lock on the RasterImage in ScaleRequest so that the srcFrame doesn't go away if we need to discard images to free up memory. r=seth, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit f3f9e0f211c9c179f9f240eafd4bfcbfc903c3d4 Author: George Wright <george(a)mozilla.com> Date: Fri Jun 6 14:26:21 2014 -0400 Bug 913805 - Hold a lock on the RasterImage in ScaleRequest so that the srcFrame doesn't go away if we need to discard images to free up memory. r=seth, a=abillings --- image/src/RasterImage.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/image/src/RasterImage.cpp b/image/src/RasterImage.cpp index 42d4232..fdd9654 100644 --- a/image/src/RasterImage.cpp +++ b/image/src/RasterImage.cpp @@ -208,6 +208,9 @@ public: bool success = false; if (!dstLocked) { + // We need to hold a lock onto the RasterImage object itself so that + // it (and its associated imgFrames) aren't marked as discardable. + bool imgLocked = NS_SUCCEEDED(image->LockImage()); bool srcLocked = NS_SUCCEEDED(srcFrame->LockImageData()); dstLocked = NS_SUCCEEDED(dstFrame->LockImageData()); @@ -216,7 +219,7 @@ public: success = srcLocked && NS_SUCCEEDED(srcFrame->GetSurface(getter_AddRefs(srcASurf))); success = success && dstLocked && NS_SUCCEEDED(dstFrame->GetSurface(getter_AddRefs(dstASurf))); - success = success && srcLocked && dstLocked && srcASurf && dstASurf; + success = success && imgLocked && srcLocked && dstLocked && srcASurf && dstASurf; if (success) { srcSurface = srcASurf->GetAsImageSurface(); @@ -254,6 +257,7 @@ public: bool success = false; if (dstLocked) { success = NS_SUCCEEDED(dstFrame->UnlockImageData()); + success = success && NS_SUCCEEDED(image->UnlockImage()); dstLocked = false; srcData = nullptr;

1 0