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

Address review comments

Browse source
This commit is contained in:
Jeena Lee 2016-10-27 15:42:09 -07:00
parent 94ea24e47b
commit baacc692f0
1 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/script/dom/request.rs
View file

@ -40,6 +40,7 @@ use std::cell::{Cell, Ref};
use std::rc::Rc; use std::rc::Rc;
use url::Url; use url::Url;
use dom::bindings::js::RootedReference;
#[dom_struct] #[dom_struct]
pub struct Request { pub struct Request {
reflector_: Reflector, reflector_: Reflector,
@ -326,8 +327,13 @@ impl Request {
} }
// Step 29 // Step 29
// When r.Headers()'s header list is emptied, // We cannot empty `r.Headers().header_list` because
// r.Headers that was filled in Step 28 becomes empty. // we would undo the Step 27 above. One alternative is to set
// `headers_copy` as a deep copy of `r.Headers()`. However,
// `r.Headers()` is a `Root<T>`, and therefore it is difficult
// to obtain a mutable reference to `r.Headers()`. Without the
// mutable reference, we cannot mutate `r.Headers()` to be the
// deep copied headers in Step 27.
// Step 30 // Step 30
if r.request.borrow().mode == NetTraitsRequestMode::NoCORS { if r.request.borrow().mode == NetTraitsRequestMode::NoCORS {
@ -346,19 +352,18 @@ impl Request {
} }
// Step 31 // Step 31
if let Some(HeadersInit::Headers(_)) = init.headers { match init.headers {
try!(r.Headers().fill(Some(HeadersInit::Headers(headers_copy)))); None => {
};
// This is equivalent to the specification's concept of // This is equivalent to the specification's concept of
// "associated headers list". If an init headers is not given, // "associated headers list". If an init headers is not given,
// but an input with headers is given, set request's // but an input with headers is given, set request's
// headers as the input's Headers. // headers as the input's Headers.
if let None = init.headers {
if let RequestInfo::Request(ref input_request) = input { if let RequestInfo::Request(ref input_request) = input {
try!(r.Headers().fill(Some(HeadersInit::Headers(input_request.Headers())))); try!(r.Headers().fill(Some(HeadersInit::Headers(input_request.Headers()))));
} }
}; },
Some(_) => try!(r.Headers().fill(Some(HeadersInit::Headers(headers_copy)))),
}
// Step 32 // Step 32
let mut input_body = if let RequestInfo::Request(ref input_request) = input { let mut input_body = if let RequestInfo::Request(ref input_request) = input {