From c41af2763f6c0543ce06d269738ee2c6e1b3b7bc Mon Sep 17 00:00:00 2001 From: Stanislav Chzhen Date: Wed, 12 Mar 2025 20:23:54 +0300 Subject: [PATCH] Pull request 2366: AG-40702-fix-cache-clear Merge in DNS/adguard-home from AG-40702-fix-cache-clear to master Squashed commit of the following: commit 542a7946a9a92f64a56b1736e7411f83a42b3def Author: Stanislav Chzhen Date: Wed Mar 12 18:16:35 2025 +0300 all: fix cache clear --- CHANGELOG.md | 2 ++ internal/client/upstreammanager.go | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b92eb19a..3755ae41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,8 @@ NOTE: Add new changes BELOW THIS COMMENT. ### Fixed +- Clearing the DNS cache on the *DNS settings* page now includes both global cache and custom client cache. + - Invalid ICMPv6 Router Advertisement messages ([#7547]). - Disabled button for autofilled login form. diff --git a/internal/client/upstreammanager.go b/internal/client/upstreammanager.go index f6cad878..b804dbdc 100644 --- a/internal/client/upstreammanager.go +++ b/internal/client/upstreammanager.go @@ -153,7 +153,9 @@ func (m *upstreamManager) isConfigChanged(cliConf *customUpstreamConfig) (ok boo // upstream configuration. func (m *upstreamManager) clearUpstreamCache() { for _, c := range m.uidToCustomConf { - c.proxyConf.ClearCache() + if c.proxyConf != nil { + c.proxyConf.ClearCache() + } } }