diff options
Diffstat (limited to 'components/net')
| -rw-r--r-- | components/net/http_loader.rs | 2 | ||||
| -rw-r--r-- | components/net/resource_thread.rs | 2 | ||||
| -rw-r--r-- | components/net/websocket_loader.rs | 14 |
3 files changed, 12 insertions, 6 deletions
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs index 64c732446db..23d3af84337 100644 --- a/components/net/http_loader.rs +++ b/components/net/http_loader.rs @@ -349,7 +349,7 @@ fn set_default_accept(headers: &mut Headers) { } } -fn set_request_cookies(url: Url, headers: &mut Headers, cookie_jar: &Arc<RwLock<CookieStorage>>) { +pub fn set_request_cookies(url: Url, headers: &mut Headers, cookie_jar: &Arc<RwLock<CookieStorage>>) { let mut cookie_jar = cookie_jar.write().unwrap(); if let Some(cookie_list) = cookie_jar.cookies_for_url(&url, CookieSource::HTTP) { let mut v = Vec::new(); diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs index 37a63326173..89e63e14f79 100644 --- a/components/net/resource_thread.rs +++ b/components/net/resource_thread.rs @@ -362,6 +362,6 @@ impl ResourceManager { fn websocket_connect(&self, connect: WebSocketCommunicate, connect_data: WebSocketConnectData) { - websocket_loader::init(connect, connect_data); + websocket_loader::init(connect, connect_data, self.cookie_storage.clone()); } } diff --git a/components/net/websocket_loader.rs b/components/net/websocket_loader.rs index e25d7e7389f..52a9bb6cff3 100644 --- a/components/net/websocket_loader.rs +++ b/components/net/websocket_loader.rs @@ -2,13 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +use cookie_storage::CookieStorage; +use http_loader; use hyper::header::Host; use net_traits::MessageData; use net_traits::hosts::replace_hosts; use net_traits::unwrap_websocket_protocol; use net_traits::{WebSocketCommunicate, WebSocketConnectData, WebSocketDomAction, WebSocketNetworkEvent}; use std::ascii::AsciiExt; -use std::sync::{Arc, Mutex}; +use std::sync::{Arc, Mutex, RwLock}; use std::thread; use util::thread::spawn_named; use websocket::client::receiver::Receiver; @@ -25,7 +27,8 @@ use websocket::{Client, Message}; /// *Establish a WebSocket Connection* as defined in RFC 6455. fn establish_a_websocket_connection(resource_url: &Url, net_url: (Host, String, bool), - origin: String, protocols: Vec<String>) + origin: String, protocols: Vec<String>, + cookie_jar: Arc<RwLock<CookieStorage>>) -> WebSocketResult<(Headers, Sender<WebSocketStream>, Receiver<WebSocketStream>)> { let host = Host { @@ -40,6 +43,8 @@ fn establish_a_websocket_connection(resource_url: &Url, net_url: (Host, String, request.headers.set(WebSocketProtocol(protocols.clone())); }; + http_loader::set_request_cookies(resource_url.clone(), &mut request.headers, &cookie_jar); + let response = try!(request.send()); try!(response.validate()); @@ -58,7 +63,7 @@ fn establish_a_websocket_connection(resource_url: &Url, net_url: (Host, String, } -pub fn init(connect: WebSocketCommunicate, connect_data: WebSocketConnectData) { +pub fn init(connect: WebSocketCommunicate, connect_data: WebSocketConnectData, cookie_jar: Arc<RwLock<CookieStorage>>) { spawn_named(format!("WebSocket connection to {}", connect_data.resource_url), move || { // Step 8: Protocols. @@ -78,7 +83,8 @@ pub fn init(connect: WebSocketCommunicate, connect_data: WebSocketConnectData) { let channel = establish_a_websocket_connection(&connect_data.resource_url, net_url, connect_data.origin, - connect_data.protocols.clone()); + connect_data.protocols.clone(), + cookie_jar); let (_, ws_sender, mut receiver) = match channel { Ok(channel) => { let _ = connect.event_sender.send(WebSocketNetworkEvent::ConnectionEstablished(channel.0.clone(), |