diff options
| author | Bastien Orivel <eijebong@bananium.fr> | 2020-05-06 20:08:26 +0200 |
|---|---|---|
| committer | Bastien Orivel <eijebong@bananium.fr> | 2020-05-06 20:08:26 +0200 |
| commit | ec665d9dcee6061b0253b2b38dccda06400cdce1 (patch) | |
| tree | 67085e74d8520f9408b6638c632c416863ca25d9 /components/script | |
| parent | b290ad95c159aeefa6e3fca91876e2a5fc584584 (diff) | |
| download | servo-ec665d9dcee6061b0253b2b38dccda06400cdce1.tar.gz servo-ec665d9dcee6061b0253b2b38dccda06400cdce1.zip | |
Properly set the url on the Response object when the response is an opaqueredirect
Diffstat (limited to 'components/script')
| -rw-r--r-- | components/script/dom/eventsource.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/xmlhttprequest.rs | 2 | ||||
| -rw-r--r-- | components/script/fetch.rs | 8 | ||||
| -rw-r--r-- | components/script/stylesheet_loader.rs | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/components/script/dom/eventsource.rs b/components/script/dom/eventsource.rs index 101eb851cfb..4ab9d11f906 100644 --- a/components/script/dom/eventsource.rs +++ b/components/script/dom/eventsource.rs @@ -340,7 +340,7 @@ impl FetchResponseListener for EventSourceContext { let meta = match fm { FetchMetadata::Unfiltered(m) => m, FetchMetadata::Filtered { unsafe_, filtered } => match filtered { - FilteredMetadata::Opaque | FilteredMetadata::OpaqueRedirect => { + FilteredMetadata::Opaque | FilteredMetadata::OpaqueRedirect(_) => { return self.fail_the_connection() }, _ => unsafe_, diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 5ab370feca8..336d7a89f22 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -984,7 +984,7 @@ impl XMLHttpRequest { FilteredMetadata::Basic(m) => m, FilteredMetadata::Cors(m) => m, FilteredMetadata::Opaque => return Err(Error::Network), - FilteredMetadata::OpaqueRedirect => return Err(Error::Network), + FilteredMetadata::OpaqueRedirect(_) => return Err(Error::Network), }, }, Err(_) => { diff --git a/components/script/fetch.rs b/components/script/fetch.rs index fe0792d857f..a1ba638a8d5 100644 --- a/components/script/fetch.rs +++ b/components/script/fetch.rs @@ -246,10 +246,10 @@ impl FetchResponseListener for FetchContext { .root() .set_type(DOMResponseType::Opaque); }, - FilteredMetadata::OpaqueRedirect => { - self.response_object - .root() - .set_type(DOMResponseType::Opaqueredirect); + FilteredMetadata::OpaqueRedirect(url) => { + let r = self.response_object.root(); + r.set_type(DOMResponseType::Opaqueredirect); + r.set_final_url(url); }, }, }, diff --git a/components/script/stylesheet_loader.rs b/components/script/stylesheet_loader.rs index 8e3f3624fb1..b0c52d5fc8c 100644 --- a/components/script/stylesheet_loader.rs +++ b/components/script/stylesheet_loader.rs @@ -101,7 +101,7 @@ impl FetchResponseListener for StylesheetContext { fn process_response(&mut self, metadata: Result<FetchMetadata, NetworkError>) { if let Ok(FetchMetadata::Filtered { ref filtered, .. }) = metadata { match *filtered { - FilteredMetadata::Opaque | FilteredMetadata::OpaqueRedirect => { + FilteredMetadata::Opaque | FilteredMetadata::OpaqueRedirect(_) => { self.origin_clean = false; }, _ => {}, |