From 6e37bab48113fb696eca77a339911d6948b2d411 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 8 Dec 2025 09:31:12 +0100
Subject: [PATCH 1/2] netwatch-dns: add active check to keep DoH server

---
 netwatch-dns.rsc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netwatch-dns.rsc b/netwatch-dns.rsc
index eee5f854..a379504b 100644
--- a/netwatch-dns.rsc
+++ b/netwatch-dns.rsc
@@ -94,8 +94,8 @@
         :set ($HostInfo->"doh-url") ("https://" . [ $EitherOr $HostName ($HostVal->"host") ] . "/dns-query");
       }
 
-      :if ($DohCurrent = $HostInfo->"doh-url") do={
-        $LogPrint debug $ScriptName ("Current DoH server is still up: " . $DohCurrent);
+      :if ($DohCurrent = $HostInfo->"doh-url" && [ $IsDNSResolving ] = true) do={
+        $LogPrint debug $ScriptName ("Current DoH server is still up and resolving: " . $DohCurrent);
         :set ExitOK true;
         :error true;
       }

From 96896c37e5bf2dc80941e572c4a93c26ddcaf935 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 8 Dec 2025 09:36:03 +0100
Subject: [PATCH 2/2] netwatch-dns: update wording to reflect the extra check

---
 netwatch-dns.rsc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netwatch-dns.rsc b/netwatch-dns.rsc
index a379504b..60064057 100644
--- a/netwatch-dns.rsc
+++ b/netwatch-dns.rsc
@@ -105,7 +105,7 @@
   }
 
   :if ([ :len $DohCurrent ] > 0) do={
-    $LogPrint info $ScriptName ("Current DoH server is down, disabling: " . $DohCurrent);
+    $LogPrint info $ScriptName ("Current DoH server is down or not resolving, disabling: " . $DohCurrent);
     /ip/dns/set use-doh-server="";
     /ip/dns/cache/flush;
   }