Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Store SSL context in ResourceGroup"

Browse source 
This reverts commit 02b2aa159a.
This commit is contained in:
Anthony Ramine 2017-03-31 16:02:40 +02:00
parent 19a2516e10
commit 857958f516
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/net/resource_thread.rs
View file

@ -21,7 +21,6 @@ use net_traits::{CustomResponseMediator, ResourceId};
use net_traits::{ResourceThreads, WebSocketCommunicate, WebSocketConnectData};
use net_traits::request::{Request, RequestInit};
use net_traits::storage_thread::StorageThreadMsg;
use openssl::ssl::SslContext;
use profile_traits::time::ProfilerChan;
use serde::{Deserialize, Serialize};
use serde_json;
@ -47,7 +46,6 @@ pub struct ResourceGroup {
cookie_jar: Arc<RwLock<CookieStorage>>,
auth_cache: Arc<RwLock<AuthCache>>,
hsts_list: Arc<RwLock<HstsList>>,
ssl_context: Arc<SslContext>,
connector: Arc<Pool<Connector>>,
}
@ -111,14 +109,12 @@ fn create_resource_groups(config_dir: Option<&Path>)
cookie_jar: Arc::new(RwLock::new(cookie_jar)),
auth_cache: Arc::new(RwLock::new(auth_cache)),
hsts_list: Arc::new(RwLock::new(hsts_list.clone())),
ssl_context: ssl_context.clone(),
connector: create_http_connector(ssl_context.clone()),
};
let private_resource_group = ResourceGroup {
cookie_jar: Arc::new(RwLock::new(CookieStorage::new(150))),
auth_cache: Arc::new(RwLock::new(AuthCache::new())),
hsts_list: Arc::new(RwLock::new(HstsList::new())),
ssl_context: ssl_context.clone(),
connector: create_http_connector(ssl_context),
};
(resource_group, private_resource_group)
@ -324,12 +320,13 @@ impl CoreResourceManager {
init: RequestInit,
mut sender: IpcSender<FetchResponseMsg>,
group: &ResourceGroup) {
let ssl_context = create_ssl_context("certs");
let http_state = HttpState {
hsts_list: group.hsts_list.clone(),
cookie_jar: group.cookie_jar.clone(),
auth_cache: group.auth_cache.clone(),
// FIXME(#15694): use group.connector.clone() instead.
connector_pool: create_http_connector(group.ssl_context.clone()),
connector_pool: create_http_connector(ssl_context),
};
let ua = self.user_agent.clone();
let dc = self.devtools_chan.clone();