& aTables);
+
nsresult CreateStoreDirectory();
nsresult SetupPathNames();
nsresult RecoverBackups();
diff --git a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
index a3d7906741b6..2ba5b954597f 100644
--- a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
+++ b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
@@ -558,8 +558,8 @@ nsUrlClassifierDBServiceWorker::FinishStream()
if (NS_SUCCEEDED(mUpdateStatus)) {
if (mProtocolParser->ResetRequested()) {
- mClassifier->Reset();
- }
+ mClassifier->ResetTables(mUpdateTables);
+ }
}
mProtocolParser = nullptr;
diff --git a/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js b/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js
index 3a72c437a15c..5b2ada458480 100644
--- a/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js
+++ b/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js
@@ -64,11 +64,15 @@ function cleanUp() {
delFile("safebrowsing/test-block-simple.pset");
delFile("safebrowsing/test-track-simple.pset");
delFile("safebrowsing/test-trackwhite-simple.pset");
+ delFile("safebrowsing/moz-phish-simple.sbstore");
+ delFile("safebrowsing/moz-phish-simple.pset");
delFile("testLarge.pset");
delFile("testNoDelta.pset");
}
+// Update uses allTables by default
var allTables = "test-phish-simple,test-malware-simple,test-unwanted-simple,test-track-simple,test-trackwhite-simple,test-block-simple";
+var mozTables = "moz-phish-simple";
var dbservice = Cc["@mozilla.org/url-classifier/dbservice;1"].getService(Ci.nsIUrlClassifierDBService);
var streamUpdater = Cc["@mozilla.org/url-classifier/streamupdater;1"]
@@ -129,6 +133,10 @@ function buildBlockedUpdate(chunks, hashSize) {
return buildUpdate({"test-block-simple" : chunks}, hashSize);
}
+function buildMozPhishingUpdate(chunks, hashSize) {
+ return buildUpdate({"moz-phish-simple" : chunks}, hashSize);
+}
+
function buildBareUpdate(chunks, hashSize) {
return buildUpdate({"" : chunks}, hashSize);
}
@@ -216,15 +224,16 @@ tableData : function(expectedTables, cb)
});
},
-checkUrls: function(urls, expected, cb)
+checkUrls: function(urls, expected, cb, useMoz = false)
{
// work with a copy of the list.
urls = urls.slice(0);
var doLookup = function() {
if (urls.length > 0) {
+ var tables = useMoz ? mozTables : allTables;
var fragment = urls.shift();
var principal = secMan.createCodebasePrincipal(iosvc.newURI("http://" + fragment, null, null), {});
- dbservice.lookup(principal, allTables,
+ dbservice.lookup(principal, tables,
function(arg) {
do_check_eq(expected, arg);
doLookup();
@@ -261,6 +270,11 @@ blockedUrlsExist: function(urls, cb)
this.checkUrls(urls, 'test-block-simple', cb);
},
+mozPhishingUrlsExist: function(urls, cb)
+{
+ this.checkUrls(urls, 'moz-phish-simple', cb, true);
+},
+
subsDontExist: function(urls, cb)
{
// XXX: there's no interface for checking items in the subs table
diff --git a/toolkit/components/url-classifier/tests/unit/test_streamupdater.js b/toolkit/components/url-classifier/tests/unit/test_streamupdater.js
index 8994de1f48e3..9fa7bc6b15f8 100644
--- a/toolkit/components/url-classifier/tests/unit/test_streamupdater.js
+++ b/toolkit/components/url-classifier/tests/unit/test_streamupdater.js
@@ -195,6 +195,21 @@ QueryInterface: function(iid)
// Tests a database reset request.
function testReset() {
+ // The moz-phish-simple table is populated separately from the other update in
+ // a separate update request. Therefore it should not be reset when we run the
+ // updates later in this function.
+ var mozAddUrls = [ "moz-reset.com/a" ];
+ var mozUpdate = buildMozPhishingUpdate(
+ [
+ { "chunkNum" : 1,
+ "urls" : mozAddUrls
+ }]);
+
+ var dataUpdate = "data:," + encodeURIComponent(mozUpdate);
+
+ streamUpdater.downloadUpdates(mozTables, "", true,
+ dataUpdate, () => {}, updateError, updateError);
+
var addUrls1 = [ "foo-reset.com/a", "foo-reset.com/b" ];
var update1 = buildPhishingUpdate(
[
@@ -212,11 +227,15 @@ function testReset() {
}]);
var assertions = {
- "tableData" : "test-phish-simple;a:3",
- "urlsExist" : addUrls3,
- "urlsDontExist" : addUrls1
+ "tableData" : "moz-phish-simple;a:1\ntest-phish-simple;a:3", // tables that should still be there.
+ "mozPhishingUrlsExist" : mozAddUrls, // mozAddUrls added prior to the reset
+ // but it should still exist after reset.
+ "urlsExist" : addUrls3, // addUrls3 added after the reset.
+ "urlsDontExist" : addUrls1 // addUrls1 added prior to the reset
};
+ // Use these update responses in order. The update request only
+ // contains test-*-simple tables so the reset will only apply to these.
doTest([update1, update2, update3], assertions, false);
}
diff --git a/toolkit/content/license.html b/toolkit/content/license.html
index 49ae58e085dd..f682e5123d5c 100644
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -122,6 +122,7 @@
MIT license — microformat-shiv
MySpell License
nICEr License
+ node-properties License
nrappkit License
OpenAES License
OpenVision License
@@ -140,6 +141,7 @@
SCTP Licenses
Skia License
Snappy License
+ sprintf.js License
#ifdef USE_STLPORT
STLport License
#endif
@@ -4169,6 +4171,37 @@ PERFORMANCE OF THIS SOFTWARE.
+ node-properties License
+
+ This license applies to
+ devtools/client/shared/vendor/node-properties.js.
+
+
+The MIT License (MIT)
+
+Copyright (c) 2014 Gabriel Llamas
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+
+
nrappkit License
This license applies to certain files in the directory
@@ -4830,6 +4863,40 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+
+ sprintf.js License
+
+ This license applies to
+ devtools/client/shared/vendor/sprintf.js.
+
+
+Copyright (c) 2007-2016, Alexandru Marasteanu <hello [at) alexei (dot] ro>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+* Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+* Neither the name of this software nor the names of its contributors may be
+ used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 6c0cc7c063f6..fbb023ac066b 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -621,3 +621,68 @@ set_config('MOZ_IPDL_TESTS',
depends_if('--enable-ipdl-tests')(lambda _: True))
include('nss.configure')
+
+# Network protocol support
+# ==============================================================
+@depends(check_build_environment, '--help')
+@imports('os')
+@imports(_from='__builtin__', _import='sorted')
+def all_necko_protocols(build_env, _):
+ basedir = os.path.join(build_env.topsrcdir, 'netwerk', 'protocol')
+ return tuple(sorted(p for p in os.listdir(basedir)
+ if os.path.isdir(os.path.join(basedir, p))))
+
+default_necko_protocols = all_necko_protocols
+
+@deprecated_option('--enable-necko-protocols', nargs='*')
+def necko_protocols(protocols):
+ return protocols
+
+@depends(necko_protocols, default_necko_protocols)
+def necko_protocols(protocols, default_protocols):
+ if protocols is None or (protocols and len(protocols) == 0):
+ return None
+ if len(protocols) == 1 and protocols[0] == '':
+ return False
+ result = set()
+ for p in protocols:
+ if p in ('yes', 'all', 'default'):
+ result |= set(default_protocols)
+ continue
+ if p in ('no', 'none'):
+ result = set()
+ continue
+ if p.startswith('-'):
+ if p[1:] in result:
+ result.remove(p[1:])
+ else:
+ result.add(p)
+ if result != set(default_protocols):
+ return tuple(result)
+
+imply_option('--enable-network-protocols', necko_protocols,
+ reason='--enable-necko-protocols')
+
+option('--enable-network-protocols', nargs='+', default=default_necko_protocols,
+ choices=all_necko_protocols,
+ help='Enable/disable specific protocol handlers')
+
+@depends('--enable-network-protocols')
+def necko_protocol_defines(protocols):
+ return tuple('NECKO_PROTOCOL_%s' % p for p in protocols)
+
+add_old_configure_assignment('_NON_GLOBAL_ACDEFINES', necko_protocol_defines)
+
+@depends(necko_protocol_defines)
+@imports('__sandbox__')
+def set_necko_protocol_defines(protocols):
+ for p in protocols:
+ __sandbox__.set_define_impl(p, True)
+
+@depends('--enable-network-protocols')
+@imports(_from='__builtin__', _import='sorted')
+def necko_protocols(protocols):
+ return tuple(sorted(protocols))
+
+set_config('NECKO_PROTOCOLS', necko_protocols)
+add_old_configure_assignment('NECKO_PROTOCOLS', necko_protocols)
diff --git a/tools/lint/docs/create.rst b/tools/lint/docs/create.rst
index abc6a0888250..1a4e5275940a 100644
--- a/tools/lint/docs/create.rst
+++ b/tools/lint/docs/create.rst
@@ -53,6 +53,7 @@ linter. Here are the supported keys:
* payload - The actual linting logic, depends on the type (required)
* include - A list of glob patterns that must be matched (optional)
* exclude - A list of glob patterns that must not be matched (optional)
+* extensions - A list of file extensions to be considered (optional)
* setup - A function that sets up external dependencies (optional)
In addition to the above, some ``.lint`` files correspond to a single lint rule. For these, the
diff --git a/tools/lint/flake8.lint b/tools/lint/flake8.lint
index d460e78da4cc..810019f410b8 100644
--- a/tools/lint/flake8.lint
+++ b/tools/lint/flake8.lint
@@ -45,6 +45,7 @@ The offset is of the form (lineno_offset, num_lines) and is passed
to the lineoffset property of `ResultContainer`.
"""
+EXTENSIONS = ['.py', '.lint']
results = []
@@ -135,6 +136,7 @@ LINTER = {
'tools/lint',
],
'exclude': [],
+ 'extensions': EXTENSIONS,
'type': 'external',
'payload': lint,
}
diff --git a/widget/windows/GfxInfo.cpp b/widget/windows/GfxInfo.cpp
index 08b3a291d76a..87a7bcc7f971 100644
--- a/widget/windows/GfxInfo.cpp
+++ b/widget/windows/GfxInfo.cpp
@@ -934,7 +934,7 @@ GfxInfo::GetGfxDriverInfo()
// Bug 1198815
APPEND_TO_DRIVER_BLOCKLIST_RANGE(OperatingSystem::Windows,
(nsAString&) GfxDriverInfo::GetDeviceVendor(VendorATI), GfxDriverInfo::allDevices,
- GfxDriverInfo::allFeatures, nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION,
+ nsIGfxInfo::FEATURE_HARDWARE_VIDEO_DECODING, nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION,
DRIVER_BETWEEN_INCLUSIVE, V(15,200,0,0), V(15,200,1062,1004),
"FEATURE_FAILURE_BUG_1198815", "15.200.0.0-15.200.1062.1004");