aboutsummaryrefslogtreecommitdiffstats
path: root/components/net
diff options
context:
space:
mode:
Diffstat (limited to 'components/net')
-rw-r--r--components/net/async_runtime.rs4
-rw-r--r--components/net/decoder.rs2
-rw-r--r--components/net/filemanager_thread.rs4
-rw-r--r--components/net/hsts.rs6
-rw-r--r--components/net/http_cache.rs2
-rw-r--r--components/net/image_cache.rs5
-rw-r--r--components/net/local_directory_listing.rs2
-rw-r--r--components/net/resource_thread.rs4
-rw-r--r--components/net/tests/filemanager_thread.rs7
9 files changed, 20 insertions, 16 deletions
diff --git a/components/net/async_runtime.rs b/components/net/async_runtime.rs
index 7d1fb9daeaa..c99068b1076 100644
--- a/components/net/async_runtime.rs
+++ b/components/net/async_runtime.rs
@@ -19,9 +19,9 @@ pub static HANDLE: LazyLock<Mutex<Option<Runtime>>> = LazyLock::new(|| {
.worker_threads(
thread::available_parallelism()
.map(|i| i.get())
- .unwrap_or(servo_config::pref!(threadpools.fallback_worker_num) as usize)
+ .unwrap_or(servo_config::pref!(threadpools_fallback_worker_num) as usize)
.min(
- servo_config::pref!(threadpools.async_runtime_workers.max).max(1) as usize,
+ servo_config::pref!(threadpools_async_runtime_workers_max).max(1) as usize,
),
)
.enable_io()
diff --git a/components/net/decoder.rs b/components/net/decoder.rs
index 9b6c8f1a3d0..4d0973cdac2 100644
--- a/components/net/decoder.rs
+++ b/components/net/decoder.rs
@@ -280,7 +280,7 @@ impl Stream for BodyStream {
.content_length
.map_or(false, |c| c.0 == self.total_read);
if self.is_secure_scheme &&
- (all_content_read || pref!(network.tls.ignore_unexpected_eof))
+ (all_content_read || pref!(network_tls_ignore_unexpected_eof))
{
let source = err.source();
let is_unexpected_eof = source
diff --git a/components/net/filemanager_thread.rs b/components/net/filemanager_thread.rs
index e72290b2694..65c3736bf24 100644
--- a/components/net/filemanager_thread.rs
+++ b/components/net/filemanager_thread.rs
@@ -602,7 +602,7 @@ impl FileManagerStore {
// Check if the select_files preference is enabled
// to ensure process-level security against compromised script;
// Then try applying opt_test_path directly for testing convenience
- let opt_s = if pref!(dom.testing.html_input_element.select_files.enabled) {
+ let opt_s = if pref!(dom_testing_html_input_element_select_files_enabled) {
opt_test_path
} else {
self.query_files_from_embedder(patterns, false, embedder_proxy)
@@ -632,7 +632,7 @@ impl FileManagerStore {
// Check if the select_files preference is enabled
// to ensure process-level security against compromised script;
// Then try applying opt_test_paths directly for testing convenience
- let opt_v = if pref!(dom.testing.html_input_element.select_files.enabled) {
+ let opt_v = if pref!(dom_testing_html_input_element_select_files_enabled) {
opt_test_paths
} else {
self.query_files_from_embedder(patterns, true, embedder_proxy)
diff --git a/components/net/hsts.rs b/components/net/hsts.rs
index ebaf6e783bd..da57051790f 100644
--- a/components/net/hsts.rs
+++ b/components/net/hsts.rs
@@ -144,8 +144,8 @@ impl HstsList {
return;
}
- let upgrade_scheme = if pref!(network.enforce_tls.enabled) {
- if (!pref!(network.enforce_tls.localhost) &&
+ let upgrade_scheme = if pref!(network_enforce_tls_enabled) {
+ if (!pref!(network_enforce_tls_localhost) &&
match url.host() {
Some(Host::Domain(domain)) => {
domain.ends_with(".localhost") || domain == "localhost"
@@ -154,7 +154,7 @@ impl HstsList {
Some(Host::Ipv6(ipv6)) => ipv6.is_loopback(),
_ => false,
}) ||
- (!pref!(network.enforce_tls.onion) &&
+ (!pref!(network_enforce_tls_onion) &&
url.domain()
.is_some_and(|domain| domain.ends_with(".onion")))
{
diff --git a/components/net/http_cache.rs b/components/net/http_cache.rs
index bf6d28de220..0f0f715b3f6 100644
--- a/components/net/http_cache.rs
+++ b/components/net/http_cache.rs
@@ -756,7 +756,7 @@ impl HttpCache {
/// Storing Responses in Caches.
/// <https://tools.ietf.org/html/rfc7234#section-3>
pub fn store(&mut self, request: &Request, response: &Response) {
- if pref!(network.http_cache.disabled) {
+ if pref!(network_http_cache_disabled) {
return;
}
if request.method != Method::GET {
diff --git a/components/net/image_cache.rs b/components/net/image_cache.rs
index 3d2ffcf5706..a9a6e558919 100644
--- a/components/net/image_cache.rs
+++ b/components/net/image_cache.rs
@@ -17,6 +17,7 @@ use net_traits::image_cache::{
use net_traits::request::CorsSettings;
use net_traits::{FetchMetadata, FetchResponseMsg, FilteredMetadata, NetworkError};
use pixels::{load_from_memory, CorsStatus, Image, ImageMetadata, PixelFormat};
+use servo_config::pref;
use servo_url::{ImmutableOrigin, ServoUrl};
use webrender_api::units::DeviceIntSize;
use webrender_api::{ImageDescriptor, ImageDescriptorFlags, ImageFormat};
@@ -422,8 +423,8 @@ impl ImageCache for ImageCacheImpl {
// If no information can be obtained about the system, uses 4 threads as a default
let thread_count = thread::available_parallelism()
.map(|i| i.get())
- .unwrap_or(servo_config::pref!(threadpools.fallback_worker_num) as usize)
- .min(servo_config::pref!(threadpools.async_runtime_workers.max).max(1) as usize);
+ .unwrap_or(pref!(threadpools_fallback_worker_num) as usize)
+ .min(pref!(threadpools_async_runtime_workers_max).max(1) as usize);
ImageCacheImpl {
store: Arc::new(Mutex::new(ImageCacheStore {
diff --git a/components/net/local_directory_listing.rs b/components/net/local_directory_listing.rs
index 39e6a98d66c..ab89e054b20 100644
--- a/components/net/local_directory_listing.rs
+++ b/components/net/local_directory_listing.rs
@@ -16,7 +16,7 @@ use servo_url::ServoUrl;
use url::Url;
pub fn fetch(request: &mut Request, url: ServoUrl, path_buf: PathBuf) -> Response {
- if !pref!(network.local_directory_listing.enabled) {
+ if !pref!(network_local_directory_listing_enabled) {
// If you want to be able to browse local directories, configure Servo prefs so that
// "network.local_directory_listing.enabled" is set to true.
return Response::network_error(NetworkError::Internal(
diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs
index 2001faccd22..12278d4c326 100644
--- a/components/net/resource_thread.rs
+++ b/components/net/resource_thread.rs
@@ -695,8 +695,8 @@ impl CoreResourceManager {
) -> CoreResourceManager {
let num_threads = thread::available_parallelism()
.map(|i| i.get())
- .unwrap_or(servo_config::pref!(threadpools.fallback_worker_num) as usize)
- .min(servo_config::pref!(threadpools.resource_workers.max).max(1) as usize);
+ .unwrap_or(servo_config::pref!(threadpools_fallback_worker_num) as usize)
+ .min(servo_config::pref!(threadpools_resource_workers_max).max(1) as usize);
let pool = CoreResourceThreadPool::new(num_threads, "CoreResourceThreadPool".to_string());
let pool_handle = Arc::new(pool);
CoreResourceManager {
diff --git a/components/net/tests/filemanager_thread.rs b/components/net/tests/filemanager_thread.rs
index 9a1b33becec..0e3e8aeb91a 100644
--- a/components/net/tests/filemanager_thread.rs
+++ b/components/net/tests/filemanager_thread.rs
@@ -15,16 +15,19 @@ use net_traits::blob_url_store::BlobURLStoreError;
use net_traits::filemanager_thread::{
FileManagerThreadError, FileManagerThreadMsg, ReadFileProgress,
};
-use servo_config::set_pref;
+use servo_config::prefs::Preferences;
use crate::create_embedder_proxy;
#[test]
fn test_filemanager() {
+ let mut preferences = Preferences::default();
+ preferences.dom_testing_html_input_element_select_files_enabled = true;
+ servo_config::prefs::set(preferences);
+
let pool = CoreResourceThreadPool::new(1, "CoreResourceTestPool".to_string());
let pool_handle = Arc::new(pool);
let filemanager = FileManager::new(create_embedder_proxy(), Arc::downgrade(&pool_handle));
- set_pref!(dom.testing.html_input_element.select_files.enabled, true);
// Try to open a dummy file "components/net/tests/test.jpeg" in tree
let mut handler = File::open("tests/test.jpeg").expect("test.jpeg is stolen");
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 04:46:29 +0000