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

Merge m-c to inbound. a=merge

This commit is contained in:
Ryan VanderMeulen 2016-04-09 10:08:57 -04:00
Родитель aaee4c2b6e bf239fcfbd
Коммит bb5308d31a
10 изменённых файлов: 12187 добавлений и 6808 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1458315314000">
<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1459441171000">
<emItems>
<emItem blockID="i58" id="webmaster@buzzzzvideos.info">
<versionRange minVersion="0" maxVersion="*">
@ -3441,6 +3441,30 @@
<match name="filename" exp="(NPSWF32.*\.dll)|(NPSWF64.*\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="20.0.0.286" maxVersion="20.0.0.306" severity="0" vulnerabilitystatus="1"></versionRange>
<infoURL>https://get.adobe.com/flashplayer/</infoURL>
</pluginItem>
<pluginItem blockID="p1141">
<match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 7 Update 91" maxVersion="Java 7 Update 97" severity="0" vulnerabilitystatus="1"></versionRange>
<infoURL>https://java.com/</infoURL>
</pluginItem>
<pluginItem blockID="p1142">
<match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 8 Update 64" maxVersion="Java 8 Update 76" severity="0" vulnerabilitystatus="1"></versionRange>
<infoURL>https://java.com/</infoURL>
</pluginItem>
<pluginItem blockID="p1143">
<match name="name" exp="Java\(TM\) Platform SE 7 U(9[1-7])(\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="0" vulnerabilitystatus="1"></versionRange>
<infoURL>https://java.com/</infoURL>
</pluginItem>
<pluginItem blockID="p1144">
<match name="name" exp="Java\(TM\) Platform SE 8 U(6[4-9]|7[0-6])(\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="0" vulnerabilitystatus="1"></versionRange>
<infoURL>https://java.com/</infoURL>
</pluginItem>
<pluginItem blockID="p1145">
<match name="name" exp="Java(\(TM\))? Plug-in 10\.(9[1-7])(\.[0-9]+)?([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="0" vulnerabilitystatus="1"></versionRange>
<infoURL>https://java.com/</infoURL>
</pluginItem>
<pluginItem blockID="p1146">
<match name="name" exp="Java(\(TM\))? Plug-in 11\.(6[4-9]|7[0-6])(\.[0-9]+)?([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="0" vulnerabilitystatus="1"></versionRange>
<infoURL>https://java.com/</infoURL>
</pluginItem>
</pluginItems>
<gfxItems>
@ -3746,8 +3770,7 @@
<certItem issuerName="MGExCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxIDAeBgNVBAsTF0lkZW5UcnVzdCBQdWJsaWMgU2VjdG9yMRwwGgYDVQQDExNJZGVuVHJ1c3QgQUNFUyBDQSAx">
<serialNumber>fwAAAQAAAUrz/HmrAAAAAg==</serialNumber>
</certItem>
<certItem issuerName="MIG8MQswCQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxOzA5BgNVBAsTMlRlcm1zIG9mIHVzZSBhdCBodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhIChjKTEwMTYwNAYDVQQDEy1WZXJpU2lnbiBDbGFzcyAzIEludGVybmF0aW9uYWwgU2VydmVyIENBIC0gRzM=
">
<certItem issuerName="MIG8MQswCQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxOzA5BgNVBAsTMlRlcm1zIG9mIHVzZSBhdCBodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhIChjKTEwMTYwNAYDVQQDEy1WZXJpU2lnbiBDbGFzcyAzIEludGVybmF0aW9uYWwgU2VydmVyIENBIC0gRzM=">
<serialNumber>By7fBTreouRwX/qrpgSUsg==</serialNumber>
</certItem>
<certItem issuerName="MIG8MQswCQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxOzA5BgNVBAsTMlRlcm1zIG9mIHVzZSBhdCBodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhIChjKTEwMTYwNAYDVQQDEy1WZXJpU2lnbiBDbGFzcyAzIEludGVybmF0aW9uYWwgU2VydmVyIENBIC0gRzM=">

2
dom/media/tests/mochitest/mochitest.ini
Просмотреть файл

@ -206,7 +206,7 @@ skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (os == 'linux' && debug &&
skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18'
[test_peerConnection_twoVideoTracksInOneStream.html]
# b2g(Bug 960442, video support for WebRTC is disabled on b2g), Bug 1180000 for Linux debug e10s, android(Bug 1189784, timeouts on 4.3 emulator)
skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (android_version == '18' && debug)
skip-if = toolkit == 'gonk' || buildapp == 'mulet' || os == "android"
[test_peerConnection_addSecondAudioStream.html]
skip-if = toolkit == 'gonk' # B2G emulator is too slow to finish a renegotiation test in under 5 minutes
[test_peerConnection_answererAddSecondAudioStream.html]

1
dom/tests/mochitest/dom-level1-core/mochitest.ini
Просмотреть файл

@ -1,5 +1,4 @@
[DEFAULT]
skip-if = toolkit == 'gonk' || toolkit == 'android' # Bug 932350 - Frequent timeouts
support-files =
DOMTestCase.js
activity-home.css

1
dom/tests/mochitest/dom-level2-core/mochitest.ini
Просмотреть файл

@ -1,5 +1,4 @@
[DEFAULT]
skip-if = toolkit == 'gonk' || toolkit == 'android' # Bug 932350 - Frequent timeouts
support-files =
DOMTestCase.js
exclusions.js

4
dom/tests/mochitest/dom-level2-html/mochitest.ini
Просмотреть файл

@ -1,5 +1,4 @@
[DEFAULT]
skip-if = toolkit == 'gonk' || toolkit == 'android' # Bug 932350 - Frequent timeouts
support-files =
DOMTestCase.js
files/anchor.html
@ -285,8 +284,7 @@ support-files =
[test_HTMLDocument09.html]
[test_HTMLDocument10.html]
[test_HTMLDocument11.html]
# [test_HTMLDocument12.html]
# This test is failing on all platforms -- bug 471139
[test_HTMLDocument12.html]
[test_HTMLDocument13.html]
[test_HTMLDocument14.html]
[test_HTMLDocument15.html]

6
dom/tests/mochitest/dom-level2-html/test_HTMLDocument12.html
Просмотреть файл

@ -1,6 +1,12 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<!--
This test relies on that no cookies exist when the test starts.
If this test is failing, add code to clear all cookies to the beginning of the test.
-->
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLDocument12</title>

5
security/manager/ssl/StaticHPKPins.h
Просмотреть файл

@ -714,6 +714,7 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
{ "dist.torproject.org", true, false, false, -1, &kPinset_tor },
{ "dk.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
{ "dl.google.com", true, false, false, -1, &kPinset_google_root_pems },
{ "dns.google.com", true, false, false, -1, &kPinset_google_root_pems },
{ "do.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
{ "docs.google.com", true, false, false, -1, &kPinset_google_root_pems },
{ "domains.google.com", true, false, false, -1, &kPinset_google_root_pems },
@ -1110,8 +1111,8 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
{ "zh.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
};
// Pinning Preload List Length = 454;
// Pinning Preload List Length = 455;
static const int32_t kUnknownId = -1;
static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1467459274783000);
static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1468668857965000);

509
security/manager/ssl/nsSTSPreloadList.errors
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

18390
security/manager/ssl/nsSTSPreloadList.inc
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

48
testing/mozharness/configs/android/androidarm_4_3.py
Просмотреть файл

@ -394,67 +394,83 @@ config = {
},
"mochitest-1": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=1"],
"extra_args": ["--total-chunks=20", "--this-chunk=1"],
},
"mochitest-2": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=2"],
"extra_args": ["--total-chunks=20", "--this-chunk=2"],
},
"mochitest-3": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=3"],
"extra_args": ["--total-chunks=20", "--this-chunk=3"],
},
"mochitest-4": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=4"],
"extra_args": ["--total-chunks=20", "--this-chunk=4"],
},
"mochitest-5": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=5"],
"extra_args": ["--total-chunks=20", "--this-chunk=5"],
},
"mochitest-6": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=6"],
"extra_args": ["--total-chunks=20", "--this-chunk=6"],
},
"mochitest-7": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=7"],
"extra_args": ["--total-chunks=20", "--this-chunk=7"],
},
"mochitest-8": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=8"],
"extra_args": ["--total-chunks=20", "--this-chunk=8"],
},
"mochitest-9": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=9"],
"extra_args": ["--total-chunks=20", "--this-chunk=9"],
},
"mochitest-10": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=10"],
"extra_args": ["--total-chunks=20", "--this-chunk=10"],
},
"mochitest-11": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=11"],
"extra_args": ["--total-chunks=20", "--this-chunk=11"],
},
"mochitest-12": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=12"],
"extra_args": ["--total-chunks=20", "--this-chunk=12"],
},
"mochitest-13": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=13"],
"extra_args": ["--total-chunks=20", "--this-chunk=13"],
},
"mochitest-14": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=14"],
"extra_args": ["--total-chunks=20", "--this-chunk=14"],
},
"mochitest-15": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=15"],
"extra_args": ["--total-chunks=20", "--this-chunk=15"],
},
"mochitest-16": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=16"],
"extra_args": ["--total-chunks=20", "--this-chunk=16"],
},
"mochitest-17": {
"category": "mochitest",
"extra_args": ["--total-chunks=20", "--this-chunk=17"],
},
"mochitest-18": {
"category": "mochitest",
"extra_args": ["--total-chunks=20", "--this-chunk=18"],
},
"mochitest-19": {
"category": "mochitest",
"extra_args": ["--total-chunks=20", "--this-chunk=19"],
},
"mochitest-20": {
"category": "mochitest",
"extra_args": ["--total-chunks=20", "--this-chunk=20"],
},
"mochitest-chrome": {
"category": "mochitest",