Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make Metadata use ContentType

Browse source
This commit is contained in:
Bogdan Cuza 2015-04-13 15:13:15 +03:00
parent fe81ce942a
commit 19ffab82f1
5 changed files with 47 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/net/about_loader.rs
View file

@ -9,7 +9,9 @@ use resource_task::start_sending;
use file_loader;
use url::Url;
use hyper::header::ContentType;
use hyper::http::RawStatus;
use hyper::mime::{Mime, TopLevel, SubLevel};
use util::resource_files::resources_dir_path;
use std::borrow::IntoCow;
@ -22,7 +24,7 @@ pub fn factory(mut load_data: LoadData, classifier: Arc<MIMEClassifier>) {
let start_chan = load_data.consumer;
let chan = start_sending(start_chan, Metadata {
final_url: load_data.url,
content_type: Some(("text".to_string(), "html".to_string())),
content_type: Some(ContentType(Mime(TopLevel::Text, SubLevel::Html, vec![]))),
charset: Some("utf-8".to_string()),
headers: None,
status: Some(RawStatus(200, "OK".into_cow())),

34
components/net/resource_task.rs
View file

@ -18,8 +18,8 @@ use net_traits::ProgressMsg::Done;
use util::opts;
use util::task::spawn_named;
use hyper::header::UserAgent;
use hyper::header::{Header, SetCookie};
use hyper::header::{ContentType, Header, SetCookie, UserAgent};
use hyper::mime::{Mime, TopLevel, SubLevel};
use std::borrow::ToOwned;
use std::boxed;
@ -27,6 +27,7 @@ use std::collections::HashMap;
use std::env;
use std::fs::File;
use std::io::{BufReader, Read};
use std::str::FromStr;
use std::sync::Arc;
use std::sync::mpsc::{channel, Receiver, Sender};
use std::thunk::Invoke;
@ -78,8 +79,33 @@ pub fn start_sending_sniffed_opt(start_chan: Sender<LoadResponse>, mut metadata:
let nosniff = false;
let check_for_apache_bug = false;
metadata.content_type = classifier.classify(nosniff, check_for_apache_bug,
&metadata.content_type, &partial_body);
metadata.content_type = match metadata.content_type {
Some(ContentType(Mime(toplevel, sublevel, _))) => {
let content_type = classifier.classify(nosniff, check_for_apache_bug,
&Some((format!("{}", toplevel), format!("{}", sublevel))), &partial_body);
match content_type {
Some((tp, sb)) => {
let mime_tp: TopLevel = FromStr::from_str(&tp).unwrap();
let mime_sb: SubLevel = FromStr::from_str(&sb).unwrap();
Some(ContentType(Mime(mime_tp, mime_sb, vec!())))
}
None => None
}
}
None => {
let content_type = classifier.classify(nosniff, check_for_apache_bug,
&None, &partial_body);
match content_type {
Some((tp, sb)) => {
let mime_tp: TopLevel = FromStr::from_str(&tp).unwrap();
let mime_sb: SubLevel = FromStr::from_str(&sb).unwrap();
Some(ContentType(Mime(mime_tp, mime_sb, vec!())))
}
None => None
}
}
}
}