aboutsummaryrefslogtreecommitdiffstats
path: root/components/net/resource_thread.rs
diff options
context:
space:
mode:
authorJan Andre Ikenmeyer <jan@ikenmeyer.eu>2019-11-10 20:16:53 +0100
committerJan Andre Ikenmeyer <jan@ikenmeyer.eu>2019-11-10 20:16:53 +0100
commit941659bb309bf8633051c91eabd539ea461ed88b (patch)
treed9a32066cc7ef8080ca017ca6d0713b06da01428 /components/net/resource_thread.rs
parentc241442aecaeff5d68a184c0f2b45814a53aea94 (diff)
downloadservo-941659bb309bf8633051c91eabd539ea461ed88b.tar.gz
servo-941659bb309bf8633051c91eabd539ea461ed88b.zip
Use HSTS preload list for private HttpState, too.
Diffstat (limited to 'components/net/resource_thread.rs')
-rw-r--r--components/net/resource_thread.rs24
1 files changed, 18 insertions, 6 deletions
diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs
index e3cd2fb59aa..4be209f9d6d 100644
--- a/components/net/resource_thread.rs
+++ b/components/net/resource_thread.rs
@@ -141,19 +141,31 @@ fn create_http_states(
None => resources::read_string(Resource::SSLCertificates),
};
- let ssl_connector_builder = create_ssl_connector_builder(&certs);
let http_state = HttpState {
+ hsts_list: RwLock::new(hsts_list),
cookie_jar: RwLock::new(cookie_jar),
auth_cache: RwLock::new(auth_cache),
+ history_states: RwLock::new(HashMap::new()),
http_cache: RwLock::new(http_cache),
http_cache_state: Mutex::new(HashMap::new()),
- hsts_list: RwLock::new(hsts_list),
- history_states: RwLock::new(HashMap::new()),
- client: create_http_client(ssl_connector_builder, HANDLE.lock().unwrap().executor()),
+ client: create_http_client(
+ create_ssl_connector_builder(&certs),
+ HANDLE.lock().unwrap().executor(),
+ ),
};
- let private_ssl_client = create_ssl_connector_builder(&certs);
- let private_http_state = HttpState::new(private_ssl_client);
+ let private_http_state = HttpState {
+ hsts_list: RwLock::new(HstsList::from_servo_preload()),
+ cookie_jar: RwLock::new(CookieStorage::new(150)),
+ auth_cache: RwLock::new(AuthCache::new()),
+ history_states: RwLock::new(HashMap::new()),
+ http_cache: RwLock::new(HttpCache::new()),
+ http_cache_state: Mutex::new(HashMap::new()),
+ client: create_http_client(
+ create_ssl_connector_builder(&certs),
+ HANDLE.lock().unwrap().executor(),
+ ),
+ };
(Arc::new(http_state), Arc::new(private_http_state))
}