diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 65ccb435dbf0..8d1456a73ae6 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -118,7 +118,7 @@ pub struct XMLHttpRequest { timeout: Cell, with_credentials: Cell, upload: JS, - response_url: String, + response_url: DOMRefCell, status: Cell, status_text: DOMRefCell, response: DOMRefCell, @@ -160,7 +160,7 @@ impl XMLHttpRequest { timeout: Cell::new(0u32), with_credentials: Cell::new(false), upload: JS::from_rooted(&XMLHttpRequestUpload::new(global)), - response_url: String::from(""), + response_url: DOMRefCell::new(String::from("")), status: Cell::new(0), status_text: DOMRefCell::new(ByteString::new(vec!())), response: DOMRefCell::new(ByteString::new(vec!())), @@ -691,7 +691,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest { // https://xhr.spec.whatwg.org/#the-responseurl-attribute fn ResponseURL(&self) -> USVString { - USVString(self.response_url.clone()) + USVString(self.response_url.borrow().clone()) } // https://xhr.spec.whatwg.org/#the-status-attribute @@ -876,6 +876,8 @@ impl XMLHttpRequest { } } + *self.response_url.borrow_mut() = metadata.final_url.serialize_no_fragment(); + // XXXManishearth Clear cache entries in case of a network error self.process_partial_response(XHRProgress::HeadersReceived(gen_id, metadata.headers, @@ -980,6 +982,7 @@ impl XMLHttpRequest { // Subsubsteps 5-7 self.send_flag.set(false); + self.change_ready_state(XMLHttpRequestState::Done); return_if_fetch_was_terminated!(); // Subsubsteps 10-12 diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index feefdc2077e7..b317fc484329 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -34794,6 +34794,12 @@ "deleted": [], "items": { "testharness": { + "XMLHttpRequest/responseurl.html": [ + { + "path": "XMLHttpRequest/responseurl.html", + "url": "/XMLHttpRequest/responseurl.html" + } + ], "html/semantics/forms/textfieldselection/selection-after-content-change.html": [ { "path": "html/semantics/forms/textfieldselection/selection-after-content-change.html", diff --git a/tests/wpt/metadata/XMLHttpRequest/responsexml-document-properties.htm.ini b/tests/wpt/metadata/XMLHttpRequest/responsexml-document-properties.htm.ini index 743902575c94..32ef62731173 100644 --- a/tests/wpt/metadata/XMLHttpRequest/responsexml-document-properties.htm.ini +++ b/tests/wpt/metadata/XMLHttpRequest/responsexml-document-properties.htm.ini @@ -3,12 +3,6 @@ [domain] expected: FAIL - [URL] - expected: FAIL - - [documentURI] - expected: FAIL - [referrer] expected: FAIL diff --git a/tests/wpt/web-platform-tests/XMLHttpRequest/responseurl.html b/tests/wpt/web-platform-tests/XMLHttpRequest/responseurl.html new file mode 100644 index 000000000000..b730e045d8d5 --- /dev/null +++ b/tests/wpt/web-platform-tests/XMLHttpRequest/responseurl.html @@ -0,0 +1,37 @@ + + + + XMLHttpRequest: responseURL test + + + + + +
+ + +