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

Auto merge of #9972 - dagnir:xhr-data, r=KiChjang

Browse source 
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 -->
This commit is contained in:
bors-servo 2016-04-03 20:45:36 +05:30
commit d35ae3beb7
4 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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);