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

auto merge of #3917 : mukilan/servo/xhr-status-async, r=jdm

Browse source 
Fixes #3877
This commit is contained in:
bors-servo 2014-11-06 19:00:29 -07:00
commit 338a9c3f05
9 changed files with 30 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -890,8 +890,8 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> {
},
LoadingMsg(_, partial_response) => {
// For synchronous requests, this should not fire any events, and just store data
// Part of step 13, send() (processing response body)
// XXXManishearth handle errors, if any (substep 1)
// Part of step 11, send() (processing response body)
// XXXManishearth handle errors, if any (substep 2)
*self.response.borrow_mut() = partial_response;
if !self.sync.get() {
@ -903,22 +903,23 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> {
}
},
DoneMsg(_) => {
// Part of step 13, send() (processing response end of file)
// XXXManishearth handle errors, if any (substep 1)
assert!(self.ready_state.get() == HeadersReceived ||
self.ready_state.get() == Loading ||
self.sync.get());
// Substep 3
if self.ready_state.get() == Loading || self.sync.get() {
// Subsubsteps 2-4
self.send_flag.set(false);
self.change_ready_state(XHRDone);
return_if_fetch_was_terminated!();
// Subsubsteps 5-7
self.dispatch_response_progress_event("progress".to_string());
return_if_fetch_was_terminated!();
self.dispatch_response_progress_event("load".to_string());
return_if_fetch_was_terminated!();
self.dispatch_response_progress_event("loadend".to_string());
}
// Part of step 11, send() (processing response end of file)
// XXXManishearth handle errors, if any (substep 2)
// Subsubsteps 5-7
self.send_flag.set(false);
self.change_ready_state(XHRDone);
return_if_fetch_was_terminated!();
// Subsubsteps 10-12
self.dispatch_response_progress_event("progress".to_string());
return_if_fetch_was_terminated!();
self.dispatch_response_progress_event("load".to_string());
return_if_fetch_was_terminated!();
self.dispatch_response_progress_event("loadend".to_string());
},
ErroredMsg(_, e) => {
self.send_flag.set(false);

3
tests/wpt/metadata/XMLHttpRequest/anonymous-mode-unsupported.htm.ini
View file

@ -1,6 +1,5 @@
[anonymous-mode-unsupported.htm]
type: testharness
expected: TIMEOUT
[XMLHttpRequest: anonymous mode unsupported]
expected: TIMEOUT
expected: FAIL

6
tests/wpt/metadata/XMLHttpRequest/open-after-setrequestheader.htm.ini
View file

@ -1,6 +0,0 @@
[open-after-setrequestheader.htm]
type: testharness
expected: TIMEOUT
[XMLHttpRequest: open() after setRequestHeader()]
expected: TIMEOUT

7
tests/wpt/metadata/XMLHttpRequest/response-json.htm.ini
View file

@ -1,3 +1,8 @@
[response-json.htm]
type: testharness
expected: TIMEOUT
[JSON object roundtrip]
expected: FAIL
[JSON roundtrip with Japanese text]
expected: FAIL

5
tests/wpt/metadata/XMLHttpRequest/send-entity-body-get-head-async.htm.ini
View file

@ -1,9 +1,8 @@
[send-entity-body-get-head-async.htm]
type: testharness
expected: TIMEOUT
[XMLHttpRequest: send() - non-empty data argument and GET/HEAD - async, no upload events should fire (GET)]
expected: NOTRUN
expected: FAIL
[XMLHttpRequest: send() - non-empty data argument and GET/HEAD - async, no upload events should fire (HEAD)]
expected: NOTRUN
expected: FAIL

6
tests/wpt/metadata/XMLHttpRequest/send-no-response-event-loadend.htm.ini
View file

@ -1,6 +0,0 @@
[send-no-response-event-loadend.htm]
type: testharness
expected: TIMEOUT
[XMLHttpRequest: The send() method: Fire a progress event named loadend (no response entity body)]
expected: TIMEOUT

6
tests/wpt/metadata/XMLHttpRequest/send-no-response-event-order.htm.ini
View file

@ -1,6 +0,0 @@
[send-no-response-event-order.htm]
type: testharness
expected: TIMEOUT
[XMLHttpRequest: The send() method: event order when there is no response entity body]
expected: TIMEOUT

3
tests/wpt/metadata/XMLHttpRequest/status-async.htm.ini
View file

@ -1,3 +1,4 @@
[status-async.htm]
type: testharness
expected: TIMEOUT
disabled: issue 3596

58
tests/wpt/metadata/XMLHttpRequest/status-error.htm.ini
View file

@ -1,60 +1,4 @@
[status-error.htm]
type: testharness
expected: TIMEOUT
[XMLHttpRequest: status error handling GET 200]
expected: TIMEOUT
[XMLHttpRequest: status error handling GET 400]
expected: TIMEOUT
[XMLHttpRequest: status error handling GET 401]
expected: TIMEOUT
[XMLHttpRequest: status error handling GET 404]
expected: TIMEOUT
[XMLHttpRequest: status error handling GET 410]
expected: TIMEOUT
[XMLHttpRequest: status error handling GET 500]
expected: TIMEOUT
[XMLHttpRequest: status error handling GET 699]
expected: TIMEOUT
[XMLHttpRequest: status error handling HEAD 200]
expected: TIMEOUT
[XMLHttpRequest: status error handling HEAD 404]
expected: TIMEOUT
[XMLHttpRequest: status error handling HEAD 500]
expected: TIMEOUT
[XMLHttpRequest: status error handling HEAD 699]
expected: TIMEOUT
[XMLHttpRequest: status error handling POST 200]
expected: TIMEOUT
[XMLHttpRequest: status error handling POST 404]
expected: TIMEOUT
[XMLHttpRequest: status error handling POST 500]
expected: TIMEOUT
[XMLHttpRequest: status error handling POST 699]
expected: TIMEOUT
[XMLHttpRequest: status error handling PUT 200]
expected: TIMEOUT
[XMLHttpRequest: status error handling PUT 404]
expected: TIMEOUT
[XMLHttpRequest: status error handling PUT 500]
expected: TIMEOUT
[XMLHttpRequest: status error handling PUT 699]
expected: TIMEOUT
disabled: issue 3596