From bfd999f71e198cffb7b1e84d1848c871937e3bd8 Mon Sep 17 00:00:00 2001 From: Jeena Lee Date: Mon, 7 Nov 2016 21:52:58 -0800 Subject: [PATCH] Fill r's headers with headers_copy when HeadersInit::Headers is given Instead of filling request's headers whenever a `HeadersInit` is given, this patch fills request's headers only when `HeadersInit` with a type of `Headers` is given. Previously, the constructor tried to fill request's headers with itself, causing Servo to crash. --- components/script/dom/request.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs index ad328b2c269..8b64bca337b 100644 --- a/components/script/dom/request.rs +++ b/components/script/dom/request.rs @@ -361,7 +361,8 @@ impl Request { try!(r.Headers().fill(Some(HeadersInit::Headers(input_request.Headers())))); } }, - Some(_) => try!(r.Headers().fill(Some(HeadersInit::Headers(headers_copy)))), + Some(HeadersInit::Headers(_)) => try!(r.Headers().fill(Some(HeadersInit::Headers(headers_copy)))), + _ => {}, } // Step 32