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

Use the correct origin in fetch

Browse source
This commit is contained in:
Keith Yeung 2017-10-14 12:35:17 -07:00
parent 5227df260c
commit d5e7137b52
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/net/http_loader.rs
View file

@ -671,8 +671,10 @@ pub fn http_redirect_fetch(request: &mut Request,
request.redirect_count += 1; request.redirect_count += 1;
// Step 7 // Step 7
// FIXME: Correctly use request's origin let same_origin = match request.origin {
let same_origin = location_url.origin() == request.current_url().origin(); Origin::Origin(ref origin) => *origin == location_url.origin(),
Origin::Client => panic!("Request origin should not be client for {}", request.current_url()),
};
let has_credentials = has_credentials(&location_url); let has_credentials = has_credentials(&location_url);
if request.mode == RequestMode::CorsMode && !same_origin && has_credentials { if request.mode == RequestMode::CorsMode && !same_origin && has_credentials {
@ -691,7 +693,7 @@ pub fn http_redirect_fetch(request: &mut Request,
} }
// Step 10 // Step 10
if cors_flag && !same_origin { if cors_flag && location_url.origin() != request.current_url().origin() {
request.origin = Origin::Origin(ImmutableOrigin::new_opaque()); request.origin = Origin::Origin(ImmutableOrigin::new_opaque());
} }