From 795551acfb7bc1fe9c609fadaa63f3621566d2a5 Mon Sep 17 00:00:00 2001 From: Nathan Moinvaziri Date: Fri, 7 Jul 2023 21:45:34 -0700 Subject: [PATCH] Fixed wrong value for uses_system_config in some resolvers. --- resolver_mac.c | 2 +- resolver_posix.c | 2 +- resolver_win8.c | 2 +- resolver_winrt.c | 23 +++++++++++------------ resolver_winxp.c | 2 +- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/resolver_mac.c b/resolver_mac.c index c764c2a..5002b95 100644 --- a/resolver_mac.c +++ b/resolver_mac.c @@ -244,7 +244,7 @@ proxy_resolver_i_s *proxy_resolver_mac_get_interface(void) { proxy_resolver_mac_create, proxy_resolver_mac_delete, false /* get_proxies_for_url should be spooled to another thread */, - true /* get_proxies_for_url does not take into account system config */, + false /* get_proxies_for_url does not take into account system config */, proxy_resolver_mac_global_init, proxy_resolver_mac_global_cleanup}; return &proxy_resolver_mac_i; diff --git a/resolver_posix.c b/resolver_posix.c index c951a5f..5defd28 100644 --- a/resolver_posix.c +++ b/resolver_posix.c @@ -297,7 +297,7 @@ proxy_resolver_i_s *proxy_resolver_posix_get_interface(void) { proxy_resolver_posix_create, proxy_resolver_posix_delete, false /* get_proxies_for_url should be spooled to another thread */, - true /* get_proxies_for_url does not take into account system config */, + false /* get_proxies_for_url does not take into account system config */, proxy_resolver_posix_global_init, proxy_resolver_posix_global_cleanup}; return &proxy_resolver_posix_i; diff --git a/resolver_win8.c b/resolver_win8.c index e108b5f..8786d76 100644 --- a/resolver_win8.c +++ b/resolver_win8.c @@ -169,7 +169,7 @@ bool proxy_resolver_win8_get_proxies_for_url(void *ctx, const char *url) { auto_config_url = proxy_config_get_auto_config_url(); if (auto_config_url) { - // Use auto configuration script specified in system settings + // Use auto configuration script specified by system auto_config_url_wide = utf8_dup_to_wchar(auto_config_url); if (!auto_config_url_wide) { proxy_resolver->error = ERROR_OUTOFMEMORY; diff --git a/resolver_winrt.c b/resolver_winrt.c index 13ed32a..b7aabfa 100644 --- a/resolver_winrt.c +++ b/resolver_winrt.c @@ -397,17 +397,16 @@ bool proxy_resolver_winrt_global_cleanup(void) { } proxy_resolver_i_s *proxy_resolver_winrt_get_interface(void) { - static proxy_resolver_i_s proxy_resolver_winrt_i = { - proxy_resolver_winrt_get_proxies_for_url, - proxy_resolver_winrt_get_list, - proxy_resolver_winrt_get_error, - proxy_resolver_winrt_wait, - proxy_resolver_winrt_cancel, - proxy_resolver_winrt_create, - proxy_resolver_winrt_delete, - true /* get_proxies_for_url is handled asynchronously */, - true /* get_proxies_for_url takes into account system config */, - proxy_resolver_winrt_global_init, - proxy_resolver_winrt_global_cleanup}; + static proxy_resolver_i_s proxy_resolver_winrt_i = {proxy_resolver_winrt_get_proxies_for_url, + proxy_resolver_winrt_get_list, + proxy_resolver_winrt_get_error, + proxy_resolver_winrt_wait, + proxy_resolver_winrt_cancel, + proxy_resolver_winrt_create, + proxy_resolver_winrt_delete, + true /* get_proxies_for_url is handled asynchronously */, + true /* get_proxies_for_url takes into account system config */, + proxy_resolver_winrt_global_init, + proxy_resolver_winrt_global_cleanup}; return &proxy_resolver_winrt_i; } diff --git a/resolver_winxp.c b/resolver_winxp.c index 1d643ad..cc2001c 100644 --- a/resolver_winxp.c +++ b/resolver_winxp.c @@ -49,7 +49,7 @@ bool proxy_resolver_winxp_get_proxies_for_url(void *ctx, const char *url) { auto_config_url = proxy_config_get_auto_config_url(); if (auto_config_url) { - // Use auto configuration script specified in system settings + // Use auto configuration script specified by system auto_config_url_wide = utf8_dup_to_wchar(auto_config_url); if (!auto_config_url_wide) { proxy_resolver->error = ERROR_OUTOFMEMORY;