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 #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

12
components/script/cors.rs
View file

@ -64,15 +64,21 @@ impl CORSRequest {
destination: Url,
mode: RequestMode,
method: Method,
headers: Headers)
headers: Headers,
same_origin_data_url_flag: bool)
-> Result<Option<CORSRequest>, ()> {
if referer.scheme == destination.scheme && referer.host() == destination.host() &&
referer.port() == destination.port() {
return Ok(None); // Not cross-origin, proceed with a normal fetch
}
match &*destination.scheme {
// TODO: If the request's same origin data url flag is set (which isn't the case for XHR)
// we can fetch a data URL normally. about:blank can also be fetched by XHR
// As per (https://fetch.spec.whatwg.org/#main-fetch 5.1.9), about URLs can be fetched
// the same as a basic request.
"about" if destination.path() == Some(&["blank".to_owned()]) => Ok(None),
// As per (https://fetch.spec.whatwg.org/#main-fetch 5.1.9), data URLs can be fetched
// the same as a basic request if the request's method is GET and the
// same-origin data-URL flag is set.
"data" if same_origin_data_url_flag && method == Method::Get => Ok(None),
"http" | "https" => {
let mut req = CORSRequest::new(referer, destination, mode, method, headers);
req.preflight_flag = !is_simple_method(&req.method) ||

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