Auto merge of #10672 - frewsxcv:net-network, r=KiChjang

Improvements to network preferences, HTTP redirection limiting.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10672)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-19 04:06:25 +05:30
commit 80662f1e4e
7 changed files with 20 additions and 13 deletions

View file

@ -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;
}