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

Revert "Introduce create_ssl_context"

Browse source 
This reverts commit 7a4632bfa2.
This commit is contained in:
Anthony Ramine 2017-03-31 16:02:48 +02:00
parent 857958f516
commit f66cae3f96
3 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/net/resource_thread.rs
View file

@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
//! A thread that takes a URL and streams back the binary data.
use connector::{Connector, create_http_connector, create_ssl_context};
use connector::{Connector, create_http_connector};
use cookie;
use cookie_rs;
use cookie_storage::CookieStorage;
@ -104,18 +104,17 @@ fn create_resource_groups(config_dir: Option<&Path>)
read_json_from_file(&mut hsts_list, config_dir, "hsts_list.json");
read_json_from_file(&mut cookie_jar, config_dir, "cookie_jar.json");
}
let ssl_context = create_ssl_context("certs");
let resource_group = ResourceGroup {
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())),
connector: create_http_connector(ssl_context.clone()),
connector: create_http_connector("certs"),
};
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())),
connector: create_http_connector(ssl_context),
connector: create_http_connector("certs"),
};
(resource_group, private_resource_group)
}
@ -320,13 +319,12 @@ 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(ssl_context),
connector_pool: create_http_connector("certs"),
};
let ua = self.user_agent.clone();
let dc = self.devtools_chan.clone();