diff options
| -rw-r--r-- | components/gfx/font_cache_thread.rs | 2 | ||||
| -rw-r--r-- | components/net/resource_thread.rs | 2 | ||||
| -rw-r--r-- | resources/prefs.json | 2 | ||||
| -rw-r--r-- | tests/unit/util/prefs.rs | 2 | ||||
| -rw-r--r-- | tests/wpt/mozilla/meta/mozilla/mime_sniffing_font_context.html.ini | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/components/gfx/font_cache_thread.rs b/components/gfx/font_cache_thread.rs index 7af1e0889f0..315702902b9 100644 --- a/components/gfx/font_cache_thread.rs +++ b/components/gfx/font_cache_thread.rs @@ -423,7 +423,7 @@ impl FontCacheThread { // derived from http://stackoverflow.com/a/10864297/3830 fn is_supported_font_type(toplevel: &TopLevel, sublevel: &SubLevel) -> bool { - if !prefs::get_pref("net.mime.sniff").as_boolean().unwrap_or(false) { + if !prefs::get_pref("network.mime.sniff").as_boolean().unwrap_or(false) { return true; } diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs index 7980f707139..282a89b846a 100644 --- a/components/net/resource_thread.rs +++ b/components/net/resource_thread.rs @@ -77,7 +77,7 @@ pub fn start_sending_sniffed_opt(start_chan: LoadConsumer, mut metadata: Metadat classifier: Arc<MIMEClassifier>, partial_body: &[u8], context: LoadContext) -> Result<ProgressSender, ()> { - if prefs::get_pref("net.mime.sniff").as_boolean().unwrap_or(false) { + if prefs::get_pref("network.mime.sniff").as_boolean().unwrap_or(false) { // TODO: should be calculated in the resource loader, from pull requeset #4094 let mut no_sniff = NoSniffFlag::OFF; let mut check_for_apache_bug = ApacheBugFlag::OFF; diff --git a/resources/prefs.json b/resources/prefs.json index cf7cf17ee06..6b6cbda1f71 100644 --- a/resources/prefs.json +++ b/resources/prefs.json @@ -49,7 +49,7 @@ "layout.text-orientation.enabled": false, "layout.viewport.enabled": false, "layout.writing-mode.enabled": false, - "net.mime.sniff": false, + "network.mime.sniff": false, "shell.native-titlebar.enabled": true, "shell.homepage": "http://servo.org" } diff --git a/tests/unit/util/prefs.rs b/tests/unit/util/prefs.rs index 98bc35b4dc3..d6c5b5b98bd 100644 --- a/tests/unit/util/prefs.rs +++ b/tests/unit/util/prefs.rs @@ -8,7 +8,7 @@ use util::prefs::{PrefValue, extend_prefs, read_prefs_from_file, get_pref, set_p fn test_create_pref() { let json_str = "{\ \"layout.writing-mode.enabled\": true,\ - \"net.mime.sniff\": false,\ + \"network.mime.sniff\": false,\ \"shell.homepage\": \"http://servo.org\"\ }"; diff --git a/tests/wpt/mozilla/meta/mozilla/mime_sniffing_font_context.html.ini b/tests/wpt/mozilla/meta/mozilla/mime_sniffing_font_context.html.ini index fe0f9621635..567ecfaa9cf 100644 --- a/tests/wpt/mozilla/meta/mozilla/mime_sniffing_font_context.html.ini +++ b/tests/wpt/mozilla/meta/mozilla/mime_sniffing_font_context.html.ini @@ -1,3 +1,3 @@ [mime_sniffing_font_context.html] type: testharness - prefs: [net.mime.sniff:true] + prefs: [network.mime.sniff:true] |