Bug 1462499 - changed priority of harmful. r=francois
authormatthias <matthias@kammueller.eu>
Mon, 24 Sep 2018 15:51:50 +0000
changeset 444486 10d5db1fc33fa0ef81202e9a6fdd1771a85c1af9
parent 444485 14f6d3d137ac8edab4cec6254693e42db59ab31b
child 444487 e36fa00c208967777b85d23194bc1900ca654cb1
push id34996
push userrgurzau@mozilla.com
push dateTue, 06 Nov 2018 09:53:23 +0000
treeherdermozilla-central@e160f0a60e4f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfrancois
bugs1462499
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1462499 - changed priority of harmful. r=francois Differential Revision: https://phabricator.services.mozilla.com/D6570
toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
--- a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
+++ b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
@@ -70,31 +70,31 @@ TablesToResponse(const nsACString& table
     return NS_OK;
   }
 
   // We don't check mCheckMalware and friends because disabled tables are
   // never included
   if (FindInReadable(NS_LITERAL_CSTRING("-malware-"), tables)) {
     return NS_ERROR_MALWARE_URI;
   }
+  if (FindInReadable(NS_LITERAL_CSTRING("-harmful-"), tables)) {
+    return NS_ERROR_HARMFUL_URI;
+  }
   if (FindInReadable(NS_LITERAL_CSTRING("-phish-"), tables)) {
     return NS_ERROR_PHISHING_URI;
   }
   if (FindInReadable(NS_LITERAL_CSTRING("-unwanted-"), tables)) {
     return NS_ERROR_UNWANTED_URI;
   }
   if (FindInReadable(NS_LITERAL_CSTRING("-track-"), tables)) {
     return NS_ERROR_TRACKING_URI;
   }
   if (FindInReadable(NS_LITERAL_CSTRING("-block-"), tables)) {
     return NS_ERROR_BLOCKED_URI;
   }
-  if (FindInReadable(NS_LITERAL_CSTRING("-harmful-"), tables)) {
-    return NS_ERROR_HARMFUL_URI;
-  }
   return NS_OK;
 }
 
 } // namespace safebrowsing
 } // namespace mozilla
 
 using namespace mozilla;
 using namespace mozilla::safebrowsing;