mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge latest green inbound changeset and mozilla-central

This commit is contained in:
Ed Morley 2013-07-15 10:48:54 +01:00
Родитель b68938ecb2 e1159218c3
Коммит a5daa8f4fd
3 изменённых файлов: 10 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

18
browser/app/blocklist.xml
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1372700880000">
<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1373408730000">
<emItems>
<emItem blockID="i350" id="sqlmoz@facebook.com">
<versionRange minVersion="0" maxVersion="*" severity="3">
@ -219,10 +219,6 @@
<versionRange minVersion="0" maxVersion="*" severity="1">
</versionRange>
</emItem>
<emItem blockID="i386" id="7lffxtbr@CursorMania_7l.com">
<versionRange minVersion="0" maxVersion="*" severity="1">
</versionRange>
</emItem>
<emItem blockID="i4" id="{4B3803EA-5230-4DC3-A7FC-33638F3D3542}">
<versionRange minVersion="1.2" maxVersion="1.2">
<targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
@ -285,10 +281,6 @@
<versionRange minVersion="0" maxVersion="*" severity="1">
</versionRange>
</emItem>
<emItem blockID="i388" id="5mffxtbr@MyFunCards_5m.com">
<versionRange minVersion="0" maxVersion="*" severity="1">
</versionRange>
</emItem>
<emItem blockID="i396" id="/@(ft|putlocker|clickmovie|m2k|sharerepo|smarter-?)downloader\.com$/">
<versionRange minVersion="0" maxVersion="*" severity="1">
</versionRange>
@ -391,6 +383,10 @@
<versionRange minVersion="0" maxVersion="*" severity="1">
</versionRange>
</emItem>
<emItem blockID="i426" id="addlyrics@addlyrics.net">
<versionRange minVersion="0" maxVersion="*" severity="1">
</versionRange>
</emItem>
<emItem blockID="i404" id="{a9bb9fa0-4122-4c75-bd9a-bc27db3f9155}">
<versionRange minVersion="0" maxVersion="*" severity="1">
</versionRange>
@ -576,10 +572,6 @@
<versionRange minVersion="0" maxVersion="*" severity="1">
</versionRange>
</emItem>
<emItem blockID="i384" id="7lffxtbr@PopularScreensavers_7l.com">
<versionRange minVersion="0" maxVersion="*" severity="1">
</versionRange>
</emItem>
<emItem blockID="i165" id="{EEF73632-A085-4fd3-A778-ECD82C8CB297}">
<versionRange minVersion="0" maxVersion="*" severity="3">
</versionRange>

3
security/manager/boot/src/nsSTSPreloadList.errors
Просмотреть файл

@ -8,6 +8,7 @@ apis.google.com: did not receive HSTS header
appengine.google.com: did not receive HSTS header
betnet.fr: could not connect to host
bigshinylock.minazo.net: could not connect to host
blueseed.co: did not receive HSTS header
braintreegateway.com: could not connect to host
braintreepayments.com: did not receive HSTS header
browserid.org: did not receive HSTS header
@ -50,6 +51,7 @@ ledgerscope.net: max-age too low: 86400
lists.mayfirst.org: did not receive HSTS header
logentries.com: did not receive HSTS header
mail.google.com: did not receive HSTS header
makeyourlaws.org: did not receive HSTS header
market.android.com: did not receive HSTS header
my.alfresco.com: did not receive HSTS header
mydigipass.com: did not receive HSTS header
@ -57,6 +59,7 @@ neonisi.com: could not connect to host
openshift.redhat.com: did not receive HSTS header
ottospora.nl: could not connect to host
packagist.org: max-age too low: 2592000
passwd.io: could not connect to host
paypal.com: max-age too low: 14400
piratenlogin.de: could not connect to host
plus.google.com: did not receive HSTS header

5
security/manager/boot/src/nsSTSPreloadList.inc
Просмотреть файл

@ -8,7 +8,7 @@
/*****************************************************************************/
#include "mozilla/StandardInteger.h"
const PRTime gPreloadListExpirationTime = INT64_C(1383992137406000);
const PRTime gPreloadListExpirationTime = INT64_C(1384596271277000);
class nsSTSPreload
{
@ -22,12 +22,12 @@ static const nsSTSPreload kSTSPreloadList[] = {
{ "api.intercom.io", false },
{ "app.recurly.com", false },
{ "arivo.com.br", true },
{ "bank.simple.com", false },
{ "bassh.net", true },
{ "bccx.com", true },
{ "blog.cyveillance.com", true },
{ "blog.linode.com", false },
{ "blog.torproject.org", false },
{ "blueseed.co", false },
{ "bugzilla.mozilla.org", true },
{ "business.medbank.com.mt", true },
{ "carezone.com", false },
@ -69,7 +69,6 @@ static const nsSTSPreload kSTSPreloadList[] = {
{ "logotype.se", true },
{ "lookout.com", false },
{ "luneta.nearbuysystems.com", false },
{ "makeyourlaws.org", false },
{ "manager.linode.com", false },
{ "mattmccutchen.net", true },
{ "mega.co.nz", false },