Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-08 00:23:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bug 8830 - Implemented XMLHttpRequest.responseURL

Browse source
This commit is contained in:
Shing Lyu 2016-02-03 15:06:13 +08:00
parent aa35d7721b
commit f55b0765d1
4 changed files with 49 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/script/dom/xmlhttprequest.rs
View file

@ -118,7 +118,7 @@ pub struct XMLHttpRequest {
timeout: Cell<u32>, timeout: Cell<u32>,
with_credentials: Cell<bool>, with_credentials: Cell<bool>,
upload: JS<XMLHttpRequestUpload>, upload: JS<XMLHttpRequestUpload>,
response_url: String, response_url: DOMRefCell<String>,
status: Cell<u16>, status: Cell<u16>,
status_text: DOMRefCell<ByteString>, status_text: DOMRefCell<ByteString>,
response: DOMRefCell<ByteString>, response: DOMRefCell<ByteString>,
@ -160,7 +160,7 @@ impl XMLHttpRequest {
timeout: Cell::new(0u32), timeout: Cell::new(0u32),
with_credentials: Cell::new(false), with_credentials: Cell::new(false),
upload: JS::from_rooted(&XMLHttpRequestUpload::new(global)), upload: JS::from_rooted(&XMLHttpRequestUpload::new(global)),
response_url: String::from(""), response_url: DOMRefCell::new(String::from("")),
status: Cell::new(0), status: Cell::new(0),
status_text: DOMRefCell::new(ByteString::new(vec!())), status_text: DOMRefCell::new(ByteString::new(vec!())),
response: 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 // https://xhr.spec.whatwg.org/#the-responseurl-attribute
fn ResponseURL(&self) -> USVString { fn ResponseURL(&self) -> USVString {
USVString(self.response_url.clone()) USVString(self.response_url.borrow().clone())
} }
// https://xhr.spec.whatwg.org/#the-status-attribute // 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 // XXXManishearth Clear cache entries in case of a network error
self.process_partial_response(XHRProgress::HeadersReceived(gen_id, self.process_partial_response(XHRProgress::HeadersReceived(gen_id,
metadata.headers, metadata.headers,
@ -980,6 +982,7 @@ impl XMLHttpRequest {
// Subsubsteps 5-7 // Subsubsteps 5-7
self.send_flag.set(false); self.send_flag.set(false);
self.change_ready_state(XMLHttpRequestState::Done); self.change_ready_state(XMLHttpRequestState::Done);
return_if_fetch_was_terminated!(); return_if_fetch_was_terminated!();
// Subsubsteps 10-12 // Subsubsteps 10-12

6
tests/wpt/metadata/MANIFEST.json
View file

@ -34794,6 +34794,12 @@
"deleted": [], "deleted": [],
"items": { "items": {
"testharness": { "testharness": {
"XMLHttpRequest/responseurl.html": [
{
"path": "XMLHttpRequest/responseurl.html",
"url": "/XMLHttpRequest/responseurl.html"
}
],
"html/semantics/forms/textfieldselection/selection-after-content-change.html": [ "html/semantics/forms/textfieldselection/selection-after-content-change.html": [
{ {
"path": "html/semantics/forms/textfieldselection/selection-after-content-change.html", "path": "html/semantics/forms/textfieldselection/selection-after-content-change.html",

6
tests/wpt/metadata/XMLHttpRequest/responsexml-document-properties.htm.ini
View file

@ -3,12 +3,6 @@
[domain] [domain]
expected: FAIL expected: FAIL
[URL]
expected: FAIL
[documentURI]
expected: FAIL
[referrer] [referrer]
expected: FAIL expected: FAIL

37
tests/wpt/web-platform-tests/XMLHttpRequest/responseurl.html Normal file
View file

@ -0,0 +1,37 @@
<!doctype html>
<html>
<head>
<title>XMLHttpRequest: responseURL test</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<link rel="help" href="https://xhr.spec.whatwg.org/#the-responseurl-attribute"/>
</head>
<body>
<div id="log"></div>
<script>
test(function() {
var client = new XMLHttpRequest()
assert_equals(client.responseURL, "")
client.open("GET", "foo.html", false)
client.send()
expected = location.href.replace(/[^/]*$/, 'foo.html')
assert_equals(client.status, 404)
assert_equals(client.responseURL, expected)
}, "404 response has proper responseURL")
test(function() {
var client = new XMLHttpRequest()
assert_equals(client.responseURL, "")
target = "image.gif"
client.open("GET", "resources/redirect.py?location=" + target, false)
client.send()
expected = location.href.replace(/[^/]*$/, "resources/" + target)
assert_equals(client.status, 200)
assert_equals(client.responseURL, expected)
}, "Redirected response has proper responseURL")
</script>
</body>
</html>