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

Re-support gzip

Browse source
This commit is contained in:
Manish Goregaokar 2016-06-06 13:20:11 +05:30
parent 909b99f1a6
commit f4e3e8e38e
2 changed files with 39 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@ use connector::create_http_connector;
use data_loader::decode; use data_loader::decode;
use fetch::cors_cache::CORSCache; use fetch::cors_cache::CORSCache;
use http_loader::{HttpState, set_default_accept_encoding, set_request_cookies}; use http_loader::{HttpState, set_default_accept_encoding, set_request_cookies};
use http_loader::{NetworkHttpRequestFactory, ReadResult, obtain_response, read_block}; use http_loader::{NetworkHttpRequestFactory, ReadResult, StreamedResponse, obtain_response, read_block};
use hyper::header::{Accept, AcceptLanguage, Authorization, AccessControlAllowCredentials}; use hyper::header::{Accept, AcceptLanguage, Authorization, AccessControlAllowCredentials};
use hyper::header::{AccessControlAllowOrigin, AccessControlAllowHeaders, AccessControlAllowMethods}; use hyper::header::{AccessControlAllowOrigin, AccessControlAllowHeaders, AccessControlAllowMethods};
use hyper::header::{AccessControlRequestHeaders, AccessControlMaxAge, AccessControlRequestMethod, Basic}; use hyper::header::{AccessControlRequestHeaders, AccessControlMaxAge, AccessControlRequestMethod, Basic};
@ -940,39 +940,50 @@ fn http_network_fetch(request: Rc<Request>,
// We're about to spawn a thread to be waited on here // We're about to spawn a thread to be waited on here
*done_chan = Some(channel()); *done_chan = Some(channel());
let meta = response.metadata().expect("Response metadata should exist at this stage");
let done_sender = done_chan.as_ref().map(|ch| ch.0.clone()); let done_sender = done_chan.as_ref().map(|ch| ch.0.clone());
spawn_named(format!("fetch worker thread"), move || { spawn_named(format!("fetch worker thread"), move || {
*res_body.lock().unwrap() = ResponseBody::Receiving(vec![]); match StreamedResponse::from_http_response(box res, meta) {
Ok(mut res) => {
*res_body.lock().unwrap() = ResponseBody::Receiving(vec![]);
loop {
match read_block(&mut res) {
Ok(ReadResult::Payload(chunk)) => {
if let ResponseBody::Receiving(ref mut body) = *res_body.lock().unwrap() {
loop { body.extend_from_slice(&chunk);
match read_block(&mut res.response) { if let Some(ref sender) = done_sender {
Ok(ReadResult::Payload(chunk)) => { let _ = sender.send(Data::Payload(chunk));
if let ResponseBody::Receiving(ref mut body) = *res_body.lock().unwrap() { }
}
body.extend_from_slice(&chunk); },
if let Some(ref sender) = done_sender { Ok(ReadResult::EOF) | Err(_) => {
let _ = sender.send(Data::Payload(chunk)); let mut empty_vec = Vec::new();
let completed_body = match *res_body.lock().unwrap() {
ResponseBody::Receiving(ref mut body) => {
// avoid cloning the body
swap(body, &mut empty_vec);
empty_vec
},
_ => empty_vec,
};
*res_body.lock().unwrap() = ResponseBody::Done(completed_body);
if let Some(ref sender) = done_sender {
let _ = sender.send(Data::Done);
}
break;
} }
} }
},
Ok(ReadResult::EOF) | Err(_) => { }
let mut empty_vec = Vec::new(); }
let completed_body = match *res_body.lock().unwrap() { Err(_) => {
ResponseBody::Receiving(ref mut body) => { // XXXManishearth we should propagate this error somehow
// avoid cloning the body *res_body.lock().unwrap() = ResponseBody::Done(vec![]);
swap(body, &mut empty_vec); if let Some(ref sender) = done_sender {
empty_vec let _ = sender.send(Data::Done);
},
_ => empty_vec,
};
*res_body.lock().unwrap() = ResponseBody::Done(completed_body);
if let Some(ref sender) = done_sender {
let _ = sender.send(Data::Done);
}
break;
} }
} }
} }
}); });
}, },

2
components/net/http_loader.rs
View file

@ -540,7 +540,7 @@ impl StreamedResponse {
StreamedResponse { metadata: m, decoder: d } StreamedResponse { metadata: m, decoder: d }
} }
fn from_http_response(response: Box<HttpResponse>, m: Metadata) -> Result<StreamedResponse, LoadError> { pub fn from_http_response(response: Box<HttpResponse>, m: Metadata) -> Result<StreamedResponse, LoadError> {
let decoder = match response.content_encoding() { let decoder = match response.content_encoding() {
Some(Encoding::Gzip) => { Some(Encoding::Gzip) => {
let result = GzDecoder::new(response); let result = GzDecoder::new(response);