Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Request's Headers to be cloned correctly #13733

Merged
merged 1 commit into from Oct 13, 2016
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Fix Request's Headers to be cloned correctly

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.
  • Loading branch information
jeenalee committed Oct 12, 2016
commit d03167d9801e6f082107899968a62b5af3be49fd
@@ -420,7 +420,7 @@ impl Request {
r
}

fn clone_from(r: &Request) -> Root<Request> {
fn clone_from(r: &Request) -> Fallible<Root<Request>> {
let req = r.request.borrow();
let url = req.url();
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.body_used.set(body_used);
*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
Ok(r_clone)
}

pub fn get_request(&self) -> NetTraitsRequest {
@@ -613,7 +614,7 @@ impl RequestMethods for Request {
}

// Step 2
Ok(Request::clone_from(self))
Request::clone_from(self)
}

#[allow(unrooted_must_root)]

This file was deleted.

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.