net: shutdown async runtime on exit

1 files changed, 5 insertions, 2 deletions

diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs
index 388cacc77af..28a397e78e6 100644
--- a/components/net/resource_thread.rs
+++ b/components/net/resource_thread.rs
@@ -152,7 +152,7 @@ fn create_http_states(
         http_cache_state: Mutex::new(HashMap::new()),
         client: create_http_client(
             create_tls_config(&certs, ALPN_H2_H1),
-            HANDLE.lock().unwrap().executor(),
+            HANDLE.lock().unwrap().as_ref().unwrap().executor(),
         ),
     };
 
@@ -165,7 +165,7 @@ fn create_http_states(
         http_cache_state: Mutex::new(HashMap::new()),
         client: create_http_client(
             create_tls_config(&certs, ALPN_H2_H1),
-            HANDLE.lock().unwrap().executor(),
+            HANDLE.lock().unwrap().as_ref().unwrap().executor(),
         ),
     };
 
@@ -591,6 +591,9 @@ impl CoreResourceManager {
         // or a short timeout has been reached.
         self.thread_pool.exit();
 
+        // Shut-down the async runtime used by fetch workers.
+        drop(HANDLE.lock().unwrap().take());
+
         debug!("Exited CoreResourceManager");
     }