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

Fixes code review nits

Browse source
This commit is contained in:
Sam Gibson 2015-08-28 08:58:09 +10:00
parent 04c012dfbf
commit 3b8bada5a1
1 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

48
components/net/http_loader.rs
View file

@ -351,7 +351,7 @@ fn update_sts_list_from_response(url: &Url, response: &HttpResponse, resource_mg
} }
pub struct LoadResponse<R: HttpResponse> { pub struct LoadResponse<R: HttpResponse> {
decoder: Decoders<R>, decoder: Decoder<R>,
pub metadata: Metadata pub metadata: Metadata
} }
@ -360,15 +360,15 @@ impl<R: HttpResponse> Read for LoadResponse<R> {
#[inline] #[inline]
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> { fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
match self.decoder { match self.decoder {
Decoders::Gzip(ref mut d) => d.read(buf), Decoder::Gzip(ref mut d) => d.read(buf),
Decoders::Deflate(ref mut d) => d.read(buf), Decoder::Deflate(ref mut d) => d.read(buf),
Decoders::Plain(ref mut d) => d.read(buf) Decoder::Plain(ref mut d) => d.read(buf)
} }
} }
} }
impl<R: HttpResponse> LoadResponse<R> { impl<R: HttpResponse> LoadResponse<R> {
fn new(m: Metadata, d: Decoders<R>) -> LoadResponse<R> { fn new(m: Metadata, d: Decoder<R>) -> LoadResponse<R> {
LoadResponse { metadata: m, decoder: d } LoadResponse { metadata: m, decoder: d }
} }
@ -378,7 +378,7 @@ impl<R: HttpResponse> LoadResponse<R> {
let result = GzDecoder::new(response); let result = GzDecoder::new(response);
match result { match result {
Ok(response_decoding) => { Ok(response_decoding) => {
return Ok(LoadResponse::new(m, Decoders::Gzip(response_decoding))); return Ok(LoadResponse::new(m, Decoder::Gzip(response_decoding)));
} }
Err(err) => { Err(err) => {
return Err(LoadError::Decoding(m.final_url, err.to_string())); return Err(LoadError::Decoding(m.final_url, err.to_string()));
@ -387,41 +387,45 @@ impl<R: HttpResponse> LoadResponse<R> {
} }
Some(Encoding::Deflate) => { Some(Encoding::Deflate) => {
let response_decoding = DeflateDecoder::new(response); let response_decoding = DeflateDecoder::new(response);
return Ok(LoadResponse::new(m, Decoders::Deflate(response_decoding))); return Ok(LoadResponse::new(m, Decoder::Deflate(response_decoding)));
} }
_ => { _ => {
return Ok(LoadResponse::new(m, Decoders::Plain(response))); return Ok(LoadResponse::new(m, Decoder::Plain(response)));
} }
} }
} }
} }
enum Decoders<R: Read> { enum Decoder<R: Read> {
Gzip(GzDecoder<R>), Gzip(GzDecoder<R>),
Deflate(DeflateDecoder<R>), Deflate(DeflateDecoder<R>),
Plain(R) Plain(R)
} }
fn send_request_to_devtools( fn send_request_to_devtools(devtools_chan: Option<Sender<DevtoolsControlMsg>>,
devtools_chan: Option<Sender<DevtoolsControlMsg>>, request_id: String, request_id: String,
url: Url, method: Method, headers: Headers, body: Option<Vec<u8>>) { url: Url,
method: Method,
headers: Headers,
body: Option<Vec<u8>>) {
if let Some(ref chan) = devtools_chan { if let Some(ref chan) = devtools_chan {
let net_event = NetworkEvent::HttpRequest(url, method, headers, body); let net_event = NetworkEvent::HttpRequest(url, method, headers, body);
chan.send(DevtoolsControlMsg::FromChrome(
ChromeToDevtoolsControlMsg::NetworkEvent(request_id, net_event) let msg = ChromeToDevtoolsControlMsg::NetworkEvent(request_id, net_event);
)).unwrap(); chan.send(DevtoolsControlMsg::FromChrome(msg)).unwrap();
} }
} }
fn send_response_to_devtools( fn send_response_to_devtools(devtools_chan: Option<Sender<DevtoolsControlMsg>>,
devtools_chan: Option<Sender<DevtoolsControlMsg>>, request_id: String, request_id: String,
headers: Option<Headers>, status: Option<RawStatus>) { headers: Option<Headers>,
status: Option<RawStatus>) {
if let Some(ref chan) = devtools_chan { if let Some(ref chan) = devtools_chan {
let net_event_response = NetworkEvent::HttpResponse(headers, status, None); let net_event_response = NetworkEvent::HttpResponse(headers, status, None);
chan.send(DevtoolsControlMsg::FromChrome(
ChromeToDevtoolsControlMsg::NetworkEvent(request_id, let msg = ChromeToDevtoolsControlMsg::NetworkEvent(request_id, net_event_response);
net_event_response))).unwrap(); chan.send(DevtoolsControlMsg::FromChrome(msg)).unwrap();
} }
} }
pub fn load<A>(load_data: LoadData, pub fn load<A>(load_data: LoadData,
@ -511,7 +515,7 @@ pub fn load<A>(load_data: LoadData,
// TODO - This is the wrong behaviour according to the RFC. However, I'm not // TODO - This is the wrong behaviour according to the RFC. However, I'm not
// sure how much "correctness" vs. real-world is important in this case. // sure how much "correctness" vs. real-world is important in this case.
// //
// http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html // https://tools.ietf.org/html/rfc7231#section-6.4
let is_redirected_request = iters != 1; let is_redirected_request = iters != 1;
let response = match load_data.data { let response = match load_data.data {
Some(ref data) if !is_redirected_request => { Some(ref data) if !is_redirected_request => {