From 8bf924dc79ed143bc4bf34b3c1d7d9ef12e0fa74 Mon Sep 17 00:00:00 2001 From: Dowon Cha Date: Fri, 6 Jan 2017 14:32:24 -0500 Subject: [PATCH] Added Websocket to RequestMode enum set unreachable in dom/request.rs for websocket fixed imports --- components/net/resource_thread.rs | 1 + components/net_traits/request.rs | 1 + components/script/dom/request.rs | 1 + 3 files changed, 3 insertions(+) diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs index 698f992fcb5..925b5e19cdc 100644 --- a/components/net/resource_thread.rs +++ b/components/net/resource_thread.rs @@ -330,6 +330,7 @@ impl CoreResourceManager { let ua = self.user_agent.clone(); let dc = self.devtools_chan.clone(); let filemanager = self.filemanager.clone(); + thread::Builder::new().name(format!("fetch thread for {}", init.url)).spawn(move || { let request = Request::from_init(init); // XXXManishearth: Check origin against pipeline id (also ensure that the mode is allowed) diff --git a/components/net_traits/request.rs b/components/net_traits/request.rs index d082f20b422..aaec4329299 100644 --- a/components/net_traits/request.rs +++ b/components/net_traits/request.rs @@ -77,6 +77,7 @@ pub enum RequestMode { SameOrigin, NoCors, CorsMode, + WebSocket } /// Request [credentials mode](https://fetch.spec.whatwg.org/#concept-request-credentials-mode) diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs index 8ca9104b945..2b26d5e1e8c 100644 --- a/components/script/dom/request.rs +++ b/components/script/dom/request.rs @@ -826,6 +826,7 @@ impl Into for NetTraitsRequestMode { NetTraitsRequestMode::SameOrigin => RequestMode::Same_origin, NetTraitsRequestMode::NoCors => RequestMode::No_cors, NetTraitsRequestMode::CorsMode => RequestMode::Cors, + NetTraitsRequestMode::WebSocket => unreachable!("Websocket request mode should never be exposed to JS"), } } }