diff options
| -rw-r--r-- | components/net/http_loader.rs | 7 | ||||
| -rw-r--r-- | components/net/resource_task.rs | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs index 7713b7b3e73..1a6827367b9 100644 --- a/components/net/http_loader.rs +++ b/components/net/http_loader.rs @@ -52,12 +52,13 @@ pub fn create_http_connector() -> Arc<Pool<Connector>> { Arc::new(Pool::with_connector(Default::default(), connector)) } -pub fn factory(hsts_list: Arc<RwLock<HSTSList>>, +pub fn factory(user_agent: String, + hsts_list: Arc<RwLock<HSTSList>>, cookie_jar: Arc<RwLock<CookieStorage>>, devtools_chan: Option<Sender<DevtoolsControlMsg>>, connector: Arc<Pool<Connector>>) - -> Box<FnBox(LoadData, LoadConsumer, Arc<MIMEClassifier>, String) + Send> { - box move |load_data: LoadData, senders, classifier, user_agent| { + -> Box<FnBox(LoadData, LoadConsumer, Arc<MIMEClassifier>) + Send> { + box move |load_data: LoadData, senders, classifier| { spawn_named(format!("http_loader for {}", load_data.url.serialize()), move || { load_for_consumer(load_data, senders, diff --git a/components/net/resource_task.rs b/components/net/resource_task.rs index 62dc75315db..91247a4a60f 100644 --- a/components/net/resource_task.rs +++ b/components/net/resource_task.rs @@ -226,8 +226,8 @@ impl ResourceManager { fn load(&mut self, load_data: LoadData, consumer: LoadConsumer) { fn from_factory(factory: fn(LoadData, LoadConsumer, Arc<MIMEClassifier>)) - -> Box<FnBox(LoadData, LoadConsumer, Arc<MIMEClassifier>, String) + Send> { - box move |load_data, senders, classifier, _user_agent| { + -> Box<FnBox(LoadData, LoadConsumer, Arc<MIMEClassifier>) + Send> { + box move |load_data, senders, classifier| { factory(load_data, senders, classifier) } } @@ -235,7 +235,8 @@ impl ResourceManager { let loader = match &*load_data.url.scheme { "file" => from_factory(file_loader::factory), "http" | "https" | "view-source" => - http_loader::factory(self.hsts_list.clone(), + http_loader::factory(self.user_agent.clone(), + self.hsts_list.clone(), self.cookie_storage.clone(), self.devtools_chan.clone(), self.connector.clone()), @@ -250,6 +251,6 @@ impl ResourceManager { }; debug!("resource_task: loading url: {}", load_data.url.serialize()); - loader.call_box((load_data, consumer, self.mime_classifier.clone(), self.user_agent.clone())); + loader.call_box((load_data, consumer, self.mime_classifier.clone())); } } |