diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-01-09 18:36:38 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-09 18:36:38 -0800 |
commit | f1c82be0e61df679db25199ac3e7afc4be5d141f (patch) | |
tree | a9ca7339aadec0dc31b5bb24d6655814172300a1 /components/script/dom/xmlhttprequest.rs | |
parent | 2a2a89b7e401e72a4d8d6199c483d7ab09ff5c1e (diff) | |
parent | 0f1eb13e3303e19841650a5c0c8e49a8f64abda5 (diff) | |
download | servo-f1c82be0e61df679db25199ac3e7afc4be5d141f.tar.gz servo-f1c82be0e61df679db25199ac3e7afc4be5d141f.zip |
Auto merge of #14868 - bd339:iss14068, r=jdm
Fix loss of response type information in Fetch API
<!-- Please describe your changes on the following line: -->
Avoids mapping response types that are distinct according to [the spec](https://fetch.spec.whatwg.org/#concept-response-type) to fewer response types. Also updates test expectations to match that we now pass tests that check the response type.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #14068
<!-- Either: -->
- [X] There are tests for these changes
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- 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/14868)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/xmlhttprequest.rs')
-rw-r--r-- | components/script/dom/xmlhttprequest.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index bf3c3580d63..9ad852286a7 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -854,8 +854,10 @@ impl XMLHttpRequest { Ok(meta) => match meta { FetchMetadata::Unfiltered(m) => m, FetchMetadata::Filtered { filtered, .. } => match filtered { + FilteredMetadata::Basic(m) => m, + FilteredMetadata::Cors(m) => m, FilteredMetadata::Opaque => return Err(Error::Network), - FilteredMetadata::Transparent(m) => m + FilteredMetadata::OpaqueRedirect => return Err(Error::Network) } }, Err(_) => { |