From ffdcd3aa7a23ef300118677a4bb90d6c9747f7b3 Mon Sep 17 00:00:00 2001 From: CYBAI Date: Thu, 9 May 2019 23:13:59 +0900 Subject: [PATCH] Fix `mode` and `credential-mode` for fetching classic worker script Ref to step 1 in https://html.spec.whatwg.org/multipage/#fetch-a-classic-script --- components/script/dom/dedicatedworkerglobalscope.rs | 5 +++-- .../workers/constructors/Worker/same-origin.html.ini | 8 +++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index 374471b8798..805f75aa0f3 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -37,7 +37,7 @@ use js::jsapi::{JSAutoCompartment, JSContext}; use js::jsval::UndefinedValue; use js::rust::HandleValue; use msg::constellation_msg::{PipelineId, TopLevelBrowsingContextId}; -use net_traits::request::{CredentialsMode, Destination, Referrer, RequestBuilder}; +use net_traits::request::{CredentialsMode, Destination, Referrer, RequestBuilder, RequestMode}; use net_traits::IpcSend; use script_traits::{TimerEvent, TimerSource, WorkerGlobalScopeInit, WorkerScriptLoadOrigin}; use servo_rand::random; @@ -310,7 +310,8 @@ impl DedicatedWorkerGlobalScope { let request = RequestBuilder::new(worker_url.clone()) .destination(Destination::Worker) - .credentials_mode(CredentialsMode::Include) + .mode(RequestMode::SameOrigin) + .credentials_mode(CredentialsMode::CredentialsSameOrigin) .use_url_credentials(true) .pipeline_id(pipeline_id) .referrer(referrer) diff --git a/tests/wpt/metadata/workers/constructors/Worker/same-origin.html.ini b/tests/wpt/metadata/workers/constructors/Worker/same-origin.html.ini index 8c2533c6d98..de990d5d1e6 100644 --- a/tests/wpt/metadata/workers/constructors/Worker/same-origin.html.ini +++ b/tests/wpt/metadata/workers/constructors/Worker/same-origin.html.ini @@ -1,3 +1,9 @@ [same-origin.html] type: testharness - disabled: intermittent failures + expected: TIMEOUT + [unsupported_scheme] + expected: FAIL + + [about_blank] + expected: TIMEOUT +