mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Auto merge of #18882 - KiChjang:fix-origin, r=jdm
Use the correct origin in fetch Fixes #18147. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18882) <!-- Reviewable:end -->
This commit is contained in:
commit
c9884604e9
2 changed files with 6 additions and 4 deletions
|
@ -670,8 +670,10 @@ pub fn http_redirect_fetch(request: &mut Request,
|
|||
request.redirect_count += 1;
|
||||
|
||||
// Step 7
|
||||
// FIXME: Correctly use request's origin
|
||||
let same_origin = location_url.origin() == request.current_url().origin();
|
||||
let same_origin = match request.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);
|
||||
|
||||
if request.mode == RequestMode::CorsMode && !same_origin && has_credentials {
|
||||
|
@ -690,7 +692,7 @@ pub fn http_redirect_fetch(request: &mut Request,
|
|||
}
|
||||
|
||||
// Step 10
|
||||
if cors_flag && !same_origin {
|
||||
if cors_flag && location_url.origin() != request.current_url().origin() {
|
||||
request.origin = Origin::Origin(ImmutableOrigin::new_opaque());
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue