mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Added global state struct
Replace hsts_list, auth_cache, and cookie_jar with http_state Reverted a few changes Moved http_state back to factory Removed unnecessary Arc Removed Arc for http_state
This commit is contained in:
parent
7f944afee8
commit
b09570b2b6
3 changed files with 122 additions and 204 deletions
|
@ -11,7 +11,7 @@ use data_loader;
|
|||
use devtools_traits::{DevtoolsControlMsg};
|
||||
use file_loader;
|
||||
use hsts::{HSTSList, preload_hsts_domains};
|
||||
use http_loader::{self, Connector, create_http_connector};
|
||||
use http_loader::{self, Connector, create_http_connector, HttpState};
|
||||
use hyper::client::pool::Pool;
|
||||
use hyper::header::{ContentType, Header, SetCookie};
|
||||
use hyper::mime::{Mime, SubLevel, TopLevel};
|
||||
|
@ -185,7 +185,7 @@ impl ResourceChannelManager {
|
|||
ControlMsg::SetCookiesForUrl(request, cookie_list, source) =>
|
||||
self.resource_manager.set_cookies_for_url(request, cookie_list, source),
|
||||
ControlMsg::GetCookiesForUrl(url, consumer, source) => {
|
||||
let cookie_jar = &self.resource_manager.cookie_storage;
|
||||
let cookie_jar = &self.resource_manager.cookie_jar;
|
||||
let mut cookie_jar = cookie_jar.write().unwrap();
|
||||
consumer.send(cookie_jar.cookies_for_url(&url, source)).unwrap();
|
||||
}
|
||||
|
@ -276,7 +276,7 @@ pub struct AuthCacheEntry {
|
|||
|
||||
pub struct ResourceManager {
|
||||
user_agent: String,
|
||||
cookie_storage: Arc<RwLock<CookieStorage>>,
|
||||
cookie_jar: Arc<RwLock<CookieStorage>>,
|
||||
auth_cache: Arc<RwLock<HashMap<Url, AuthCacheEntry>>>,
|
||||
mime_classifier: Arc<MIMEClassifier>,
|
||||
devtools_chan: Option<Sender<DevtoolsControlMsg>>,
|
||||
|
@ -292,7 +292,7 @@ impl ResourceManager {
|
|||
devtools_channel: Option<Sender<DevtoolsControlMsg>>) -> ResourceManager {
|
||||
ResourceManager {
|
||||
user_agent: user_agent,
|
||||
cookie_storage: Arc::new(RwLock::new(CookieStorage::new())),
|
||||
cookie_jar: Arc::new(RwLock::new(CookieStorage::new())),
|
||||
auth_cache: Arc::new(RwLock::new(HashMap::new())),
|
||||
mime_classifier: Arc::new(MIMEClassifier::new()),
|
||||
devtools_chan: devtools_channel,
|
||||
|
@ -308,7 +308,7 @@ impl ResourceManager {
|
|||
if let Ok(SetCookie(cookies)) = header {
|
||||
for bare_cookie in cookies {
|
||||
if let Some(cookie) = cookie::Cookie::new_wrapped(bare_cookie, &request, source) {
|
||||
let cookie_jar = &self.cookie_storage;
|
||||
let cookie_jar = &self.cookie_jar;
|
||||
let mut cookie_jar = cookie_jar.write().unwrap();
|
||||
cookie_jar.push(cookie, source);
|
||||
}
|
||||
|
@ -344,13 +344,17 @@ impl ResourceManager {
|
|||
let cancel_listener = CancellationListener::new(cancel_resource);
|
||||
let loader = match &*load_data.url.scheme {
|
||||
"file" => from_factory(file_loader::factory),
|
||||
"http" | "https" | "view-source" =>
|
||||
"http" | "https" | "view-source" => {
|
||||
let http_state = HttpState {
|
||||
hsts_list: self.hsts_list.clone(),
|
||||
cookie_jar: self.cookie_jar.clone(),
|
||||
auth_cache: self.auth_cache.clone()
|
||||
};
|
||||
http_loader::factory(self.user_agent.clone(),
|
||||
self.hsts_list.clone(),
|
||||
self.cookie_storage.clone(),
|
||||
self.auth_cache.clone(),
|
||||
http_state,
|
||||
self.devtools_chan.clone(),
|
||||
self.connector.clone()),
|
||||
self.connector.clone())
|
||||
},
|
||||
"data" => from_factory(data_loader::factory),
|
||||
"about" => from_factory(about_loader::factory),
|
||||
_ => {
|
||||
|
@ -370,6 +374,6 @@ impl ResourceManager {
|
|||
fn websocket_connect(&self,
|
||||
connect: WebSocketCommunicate,
|
||||
connect_data: WebSocketConnectData) {
|
||||
websocket_loader::init(connect, connect_data, self.cookie_storage.clone());
|
||||
websocket_loader::init(connect, connect_data, self.cookie_jar.clone());
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue