aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-04-03 20:45:36 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2016-04-03 20:45:36 +0530
commitd35ae3beb73158ec4c9ab20b3361e948379a4c90 (patch)
tree9348ddb374a7abd95d1559527ee553f3d1803ad6 /components/script/dom
parentf6c29249360134b2a437de0674f606b36327bfb1 (diff)
parent6f2bce779d044ba321b25f4207f052e1b72a18e1 (diff)
downloadservo-d35ae3beb73158ec4c9ab20b3361e948379a4c90.tar.gz
servo-d35ae3beb73158ec4c9ab20b3361e948379a4c90.zip
Auto merge of #9972 - dagnir:xhr-data, r=KiChjang
Xhr data Builds on existing work by @emosenkis. Fixes #8015. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9972) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/xmlhttprequest.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
index 31833912795..6d3ea932099 100644
--- a/components/script/dom/xmlhttprequest.rs
+++ b/components/script/dom/xmlhttprequest.rs
@@ -626,7 +626,8 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
load_data.url.clone(),
mode,
load_data.method.clone(),
- combined_headers);
+ combined_headers,
+ true);
match cors_request {
Ok(None) => {
let mut buf = String::new();
@@ -1301,7 +1302,8 @@ impl XMLHttpRequest {
global: GlobalRef) -> ErrorResult {
let cors_request = match cors_request {
Err(_) => {
- // Happens in case of cross-origin non-http URIs
+ // Happens in case of unsupported cross-origin URI schemes.
+ // Supported schemes are http, https, data, and about.
self.process_partial_response(XHRProgress::Errored(
self.generation_id.get(), Error::Network));
return Err(Error::Network);