diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-12-22 16:40:53 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-22 16:40:53 -0800 |
| commit | 89cdcbc420d82aade20a2ee704fdea295dec437a (patch) | |
| tree | 2ee80387856d851c13b9679951ad03040d082de7 /components/script | |
| parent | 40527441395622dff6b970d6ff1f9f6503f54567 (diff) | |
| parent | 75be03041cc0581eb4c146bc50c64c9cffbc8d8b (diff) | |
| download | servo-89cdcbc420d82aade20a2ee704fdea295dec437a.tar.gz servo-89cdcbc420d82aade20a2ee704fdea295dec437a.zip | |
Auto merge of #14632 - servo:multi-global-fetch, r=jdm
Use the API base URL in Fetch APIs.
<!-- 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/14632)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script')
| -rw-r--r-- | components/script/dom/request.rs | 3 | ||||
| -rw-r--r-- | components/script/dom/response.rs | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs index 74b61768a5e..8ca9104b945 100644 --- a/components/script/dom/request.rs +++ b/components/script/dom/request.rs @@ -92,8 +92,7 @@ impl Request { let mut fallback_credentials: Option<NetTraitsRequestCredentials> = None; // Step 4 - // TODO: `entry settings object` is not implemented in Servo yet. - let base_url = global.get_url(); + let base_url = global.api_base_url(); match input { // Step 5 diff --git a/components/script/dom/response.rs b/components/script/dom/response.rs index 06a066d410c..1d9d62c079a 100644 --- a/components/script/dom/response.rs +++ b/components/script/dom/response.rs @@ -149,8 +149,7 @@ impl Response { // https://fetch.spec.whatwg.org/#dom-response-redirect pub fn Redirect(global: &GlobalScope, url: USVString, status: u16) -> Fallible<Root<Response>> { // Step 1 - // TODO: `entry settings object` is not implemented in Servo yet. - let base_url = global.get_url(); + let base_url = global.api_base_url(); let parsed_url = base_url.join(&url.0); // Step 2 |