aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-services_network_network__context.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-services_network_network__context.cc')
-rw-r--r--www/chromium/files/patch-services_network_network__context.cc27
1 files changed, 18 insertions, 9 deletions
diff --git a/www/chromium/files/patch-services_network_network__context.cc b/www/chromium/files/patch-services_network_network__context.cc
index 3babf4cacbec..2fa7170bcc73 100644
--- a/www/chromium/files/patch-services_network_network__context.cc
+++ b/www/chromium/files/patch-services_network_network__context.cc
@@ -1,11 +1,20 @@
---- services/network/network_context.cc.orig 2021-06-11 09:55:35 UTC
+--- services/network/network_context.cc.orig 2024-04-19 13:02:56 UTC
+++ services/network/network_context.cc
-@@ -2331,7 +2331,7 @@ NetworkContext::MakeSessionCleanupCookieStore() const
+@@ -523,7 +523,7 @@ NetworkContext::NetworkContextHttpAuthPreferences::
+ NetworkContext::NetworkContextHttpAuthPreferences::
+ ~NetworkContextHttpAuthPreferences() = default;
- net::CookieCryptoDelegate* crypto_delegate = nullptr;
- if (params_->enable_encrypted_cookies) {
--#if (defined(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
-+#if (defined(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && \
- !BUILDFLAG(IS_CHROMECAST)
- DCHECK(network_service_->os_crypt_config_set())
- << "NetworkService::SetCryptConfig must be called before creating a "
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad()
+ const {
+ if (network_service_) {
+@@ -2277,7 +2277,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged(
+ http_auth_dynamic_network_service_params->android_negotiate_account_type);
+ #endif // BUILDFLAG(IS_ANDROID)
+
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ http_auth_merged_preferences_.set_allow_gssapi_library_load(
+ http_auth_dynamic_network_service_params->allow_gssapi_library_load);
+ #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)