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

dom::Response implementation

Browse source
This commit is contained in:
Malisa Smith 2016-08-05 16:18:55 -07:00
parent 569599d404
commit faf32a7cfb
30 changed files with 402 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/net/about_loader.rs
View file

@ -4,7 +4,6 @@
use file_loader;
use hyper::header::ContentType;
use hyper::http::RawStatus;
use hyper::mime::{Mime, SubLevel, TopLevel};
use hyper_serde::Serde;
use mime_classifier::MimeClassifier;
@ -38,7 +37,7 @@ pub fn factory(mut load_data: LoadData,
Some(Serde(ContentType(Mime(TopLevel::Text, SubLevel::Html, vec![])))),
charset: Some("utf-8".to_owned()),
headers: None,
status: Some(Serde(RawStatus(200, "OK".into()))),
status: Some((200, b"OK".to_vec())),
https_state: HttpsState::None,
referrer: None,
};

3
components/net/blob_loader.rs
View file

@ -5,7 +5,6 @@
use filemanager_thread::{FileManager, UIProvider};
use hyper::header::{DispositionType, ContentDisposition, DispositionParam};
use hyper::header::{Headers, ContentType, ContentLength, Charset};
use hyper::http::RawStatus;
use hyper_serde::Serde;
use ipc_channel::ipc;
use mime::{Mime, Attr};
@ -72,7 +71,7 @@ fn load_blob<UI: 'static + UIProvider>
charset: charset.map(|c| c.as_str().to_string()),
headers: Some(Serde(headers)),
// https://w3c.github.io/FileAPI/#TwoHundredOK
status: Some(Serde(RawStatus(200, "OK".into()))),
status: Some((200, b"OK".to_vec())),
https_state: HttpsState::None,
referrer: None,
};

7
components/net/fetch/methods.rs
View file

@ -973,8 +973,9 @@ fn http_network_fetch(request: Rc<Request>,
Ok((res, msg)) => {
response.url = Some(url.clone());
response.status = Some(res.response.status);
response.raw_status = Some(res.response.status_raw().clone());
response.headers = res.response.headers.clone();
response.raw_status = Some((res.response.status_raw().0,
res.response.status_raw().1.as_bytes().to_vec()));
response.headers = res.response.headers.clone();
let res_body = response.body.clone();
@ -1001,7 +1002,7 @@ fn http_network_fetch(request: Rc<Request>,
send_response_to_devtools(
&sender, request_id.unwrap(),
meta_headers.map(Serde::into_inner),
meta_status.map(Serde::into_inner),
meta_status,
pipeline_id);
}
}

7
components/net/http_loader.rs
View file

@ -629,7 +629,7 @@ pub fn send_request_to_devtools(msg: ChromeToDevtoolsControlMsg,
pub fn send_response_to_devtools(devtools_chan: &Sender<DevtoolsControlMsg>,
request_id: String,
headers: Option<Headers>,
status: Option<RawStatus>,
status: Option<(u16, Vec<u8>)>,
pipeline_id: PipelineId) {
let response = DevtoolsHttpResponse { headers: headers, status: status, body: None, pipeline_id: pipeline_id };
let net_event_response = NetworkEvent::HttpResponse(response);
@ -1081,7 +1081,8 @@ pub fn load<A, B>(load_data: &LoadData,
None => None
});
metadata.headers = Some(Serde(adjusted_headers));
metadata.status = Some(Serde(response.status_raw().clone()));
metadata.status = Some((response.status_raw().0,
response.status_raw().1.as_bytes().to_vec()));
metadata.https_state = if doc_url.scheme() == "https" {
HttpsState::Modern
} else {
@ -1097,7 +1098,7 @@ pub fn load<A, B>(load_data: &LoadData,
send_response_to_devtools(
&chan, request_id.unwrap(),
metadata.headers.clone().map(Serde::into_inner),
metadata.status.clone().map(Serde::into_inner),
metadata.status.clone(),
pipeline_id);
}
}