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

Make cors_check take a &Request

Browse source
This commit is contained in:
Anthony Ramine 2017-04-01 00:11:15 +02:00
parent 5b037a0aa0
commit d5cbdffe37
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/net/http_loader.rs
View file

@ -558,7 +558,7 @@ pub fn http_fetch(request: Rc<Request>,
cors_flag, done_chan, context); cors_flag, done_chan, context);
// Substep 4 // Substep 4
if cors_flag && cors_check(request.clone(), &fetch_result).is_err() { if cors_flag && cors_check(&request, &fetch_result).is_err() {
return Response::network_error(NetworkError::Internal("CORS check failed".into())); return Response::network_error(NetworkError::Internal("CORS check failed".into()));
} }
@ -1238,7 +1238,7 @@ fn cors_preflight_fetch(request: Rc<Request>,
let response = http_network_or_cache_fetch(preflight.clone(), false, false, &mut None, context); let response = http_network_or_cache_fetch(preflight.clone(), false, false, &mut None, context);
// Step 7 // Step 7
if cors_check(request.clone(), &response).is_ok() && if cors_check(&request, &response).is_ok() &&
response.status.map_or(false, |status| status.is_success()) { response.status.map_or(false, |status| status.is_success()) {
// Substep 1 // Substep 1
let mut methods = if response.headers.has::<AccessControlAllowMethods>() { let mut methods = if response.headers.has::<AccessControlAllowMethods>() {
@ -1308,7 +1308,7 @@ fn cors_preflight_fetch(request: Rc<Request>,
} }
/// [CORS check](https://fetch.spec.whatwg.org#concept-cors-check) /// [CORS check](https://fetch.spec.whatwg.org#concept-cors-check)
fn cors_check(request: Rc<Request>, response: &Response) -> Result<(), ()> { fn cors_check(request: &Request, response: &Response) -> Result<(), ()> {
// Step 1 // Step 1
let origin = response.headers.get::<AccessControlAllowOrigin>().cloned(); let origin = response.headers.get::<AccessControlAllowOrigin>().cloned();