diff options
Diffstat (limited to 'src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch')
| -rw-r--r-- | src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch b/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch index 115f579..0a2b25f 100644 --- a/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch +++ b/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch @@ -15,19 +15,19 @@ index 11bfba3..ed817aa 100644 @@ -5377,9 +5377,7 @@ pref("dom.mapped_arraybuffer.enabled", t // The tables used for Safebrowsing phishing and malware checks - pref("urlclassifier.malwareTable", "goog-malware-shavar,goog-unwanted-shavar,test-harmful-simple,test-malware-simple,test-unwanted-simple"); + pref("urlclassifier.malwareTable", "goog-malware-proto,goog-unwanted-proto,test-harmful-simple,test-malware-simple,test-unwanted-simple"); -#ifdef MOZILLA_OFFICIAL --// In the official build, we are allowed to use google's private --// phishing list "goog-phish-shavar". See Bug 1288840. +-// In official builds, we are allowed to use Google's private phishing +-// list (see bug 1288840). +#ifdef MOZ_OFFICIAL_BRANDING - pref("urlclassifier.phishTable", "goog-phish-shavar,test-phish-simple"); + pref("urlclassifier.phishTable", "goog-phish-proto,test-phish-simple"); #else - pref("urlclassifier.phishTable", "googpub-phish-shavar,test-phish-simple"); + pref("urlclassifier.phishTable", "googpub-phish-proto,test-phish-simple"); diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build index 1c2c13e..7783e9d 100644 --- a/modules/libpref/moz.build +++ b/modules/libpref/moz.build -@@ -48,3 +48,6 @@ DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT'] +@@ -44,3 +44,6 @@ DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT'] FINAL_TARGET_PP_FILES += [ 'greprefs.js', ] |