From 8946a65c5a19dcf9b64fc3446467d62de3a41d62 Mon Sep 17 00:00:00 2001 From: Jeena Lee Date: Tue, 23 Aug 2016 16:01:08 -0700 Subject: [PATCH] Refactor combine method, and update expected wpt results Instead of creating an array with length of 1 of `b','`, then pushing the first element of that array to `combined_value`, push a `b','` directly to `combined_value`. The web platform test for combining headers has been updated to reflect the Fetch spec (https://github.com/w3c/web-platform-tests/pull/3646). The expected web platform test results that will be affected by this change are updated. --- components/script/dom/headers.rs | 2 +- .../metadata/fetch/api/headers/headers-combine.html.ini | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 tests/wpt/metadata/fetch/api/headers/headers-combine.html.ini diff --git a/components/script/dom/headers.rs b/components/script/dom/headers.rs index 70908fb4dfbc..4ed9a5aebec7 100644 --- a/components/script/dom/headers.rs +++ b/components/script/dom/headers.rs @@ -85,7 +85,7 @@ impl HeadersMethods for Headers { let mut combined_value: Vec = vec![]; if let Some(v) = self.header_list.borrow().get_raw(&valid_name) { combined_value = v[0].clone(); - combined_value.push(b","[0]); + combined_value.push(b','); } combined_value.extend(valid_value.iter().cloned()); self.header_list.borrow_mut().set_raw(valid_name, vec![combined_value]); diff --git a/tests/wpt/metadata/fetch/api/headers/headers-combine.html.ini b/tests/wpt/metadata/fetch/api/headers/headers-combine.html.ini deleted file mode 100644 index f12bddcc5c91..000000000000 --- a/tests/wpt/metadata/fetch/api/headers/headers-combine.html.ini +++ /dev/null @@ -1,8 +0,0 @@ -[headers-combine.html] - type: testharness - [Create headers using same name for different values] - expected: FAIL - - [Check append methods when called with already used name] - expected: FAIL -