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

Fix Request's Headers to be cloned correctly

Browse source 
Previously, when `Clone()` was called, Headers of the template Request
did not get cloned properly. This commit fixes that issue, and updates
the expected wpt results.
This commit is contained in:
Jeena Lee 2016-10-12 12:46:03 -07:00
parent f4cb87a783
commit d03167d980
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -420,7 +420,7 @@ impl Request {
r r
} }
fn clone_from(r: &Request) -> Root<Request> { fn clone_from(r: &Request) -> Fallible<Root<Request>> {
let req = r.request.borrow(); let req = r.request.borrow();
let url = req.url(); let url = req.url();
let is_service_worker_global_scope = req.is_service_worker_global_scope; let is_service_worker_global_scope = req.is_service_worker_global_scope;
@ -436,8 +436,9 @@ impl Request {
*r_clone.request.borrow_mut() = req.clone(); *r_clone.request.borrow_mut() = req.clone();
r_clone.body_used.set(body_used); r_clone.body_used.set(body_used);
*r_clone.mime_type.borrow_mut() = mime_type; *r_clone.mime_type.borrow_mut() = mime_type;
try!(r_clone.Headers().fill(Some(HeadersInit::Headers(r.Headers()))));
r_clone.Headers().set_guard(headers_guard); r_clone.Headers().set_guard(headers_guard);
r_clone Ok(r_clone)
} }
pub fn get_request(&self) -> NetTraitsRequest { pub fn get_request(&self) -> NetTraitsRequest {
@ -613,7 +614,7 @@ impl RequestMethods for Request {
} }
// Step 2 // Step 2
Ok(Request::clone_from(self)) Request::clone_from(self)
} }
#[allow(unrooted_must_root)] #[allow(unrooted_must_root)]

8
tests/wpt/metadata/fetch/api/request/request-clone.sub.html.ini
View file

@ -1,8 +0,0 @@
[request-clone.sub.html]
type: testharness
[Check cloning a request]
expected: FAIL
[Check cloning a request copies the headers]
expected: FAIL