Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 14:53:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use HSTS preload list for private HttpState, too.

Browse source
This commit is contained in:
Jan Andre Ikenmeyer 2019-11-10 20:16:53 +01:00
parent c241442aec
commit 941659bb30
No known key found for this signature in database
GPG key ID: 28F9E42748DD95AE
1 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
components/net/resource_thread.rs
View file

@ -141,19 +141,31 @@ fn create_http_states(
None => resources::read_string(Resource::SSLCertificates), None => resources::read_string(Resource::SSLCertificates),
}; };
let ssl_connector_builder = create_ssl_connector_builder(&certs);
let http_state = HttpState { let http_state = HttpState {
hsts_list: RwLock::new(hsts_list),
cookie_jar: RwLock::new(cookie_jar), cookie_jar: RwLock::new(cookie_jar),
auth_cache: RwLock::new(auth_cache), auth_cache: RwLock::new(auth_cache),
history_states: RwLock::new(HashMap::new()),
http_cache: RwLock::new(http_cache), http_cache: RwLock::new(http_cache),
http_cache_state: Mutex::new(HashMap::new()), http_cache_state: Mutex::new(HashMap::new()),
hsts_list: RwLock::new(hsts_list), client: create_http_client(
history_states: RwLock::new(HashMap::new()), create_ssl_connector_builder(&certs),
client: create_http_client(ssl_connector_builder, HANDLE.lock().unwrap().executor()), HANDLE.lock().unwrap().executor(),
),
}; };
let private_ssl_client = create_ssl_connector_builder(&certs); let private_http_state = HttpState {
let private_http_state = HttpState::new(private_ssl_client); 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)) (Arc::new(http_state), Arc::new(private_http_state))
} }