From 3f15dc6c47ef5b79a60a8a5ae0c6ee392f5b7bf1 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Sat, 5 Jul 2014 02:20:04 +0530 Subject: [PATCH 1/2] Fix encoding issues for getResponseHeader() --- src/components/script/dom/xmlhttprequest.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/script/dom/xmlhttprequest.rs b/src/components/script/dom/xmlhttprequest.rs index b0f80ceabf1..75129a97c93 100644 --- a/src/components/script/dom/xmlhttprequest.rs +++ b/src/components/script/dom/xmlhttprequest.rs @@ -556,7 +556,8 @@ impl<'a> XMLHttpRequestMethods<'a> for JSRef<'a, XMLHttpRequest> { self.response_headers.deref().borrow().iter().find(|h| { name.eq_ignore_case(&FromStr::from_str(h.header_name().as_slice()).unwrap()) }).map(|h| { - FromStr::from_str(h.header_value().as_slice()).unwrap() + // rust-http doesn't decode properly, we'll convert it back to bytes here + ByteString::new(h.header_value().as_slice().chars().map(|c| { assert!(c <= '\u00FF'); c as u8 }).collect()) }) } fn GetAllResponseHeaders(&self) -> ByteString { From 9c2f5ac2183a6bded47cda0e7bd86229531db2a4 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Sat, 5 Jul 2014 02:22:26 +0530 Subject: [PATCH 2/2] Update expectations for #2765 --- .../getresponseheader-special-characters.htm.ini | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 src/test/wpt/metadata/XMLHttpRequest/getresponseheader-special-characters.htm.ini diff --git a/src/test/wpt/metadata/XMLHttpRequest/getresponseheader-special-characters.htm.ini b/src/test/wpt/metadata/XMLHttpRequest/getresponseheader-special-characters.htm.ini deleted file mode 100644 index db10ebb1be6..00000000000 --- a/src/test/wpt/metadata/XMLHttpRequest/getresponseheader-special-characters.htm.ini +++ /dev/null @@ -1,5 +0,0 @@ -[getresponseheader-special-characters.htm] - type: testharness - [XMLHttpRequest: getResponseHeader() funny characters] - expected: FAIL -