From: Yorgos Thessalonikefs <yorgos@nlnetlabs.nl>
Date: Wed, 22 Oct 2025 10:44:59 +0000 (+0200)
Subject: Merge branch 'branch-1.24.1'
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e06b7eb3f197624b92236d5240fe7c8227d7a187;p=thirdparty%2Funbound.git

Merge branch 'branch-1.24.1'
---

e06b7eb3f197624b92236d5240fe7c8227d7a187
diff --cc testdata/serve_expired.rpl
index 4aa65e167,573e18bcf..2fd7459c1
--- a/testdata/serve_expired.rpl
+++ b/testdata/serve_expired.rpl
@@@ -3,9 -3,9 +3,10 @@@ server
  	module-config: "validator iterator"
  	qname-minimisation: "no"
  	minimal-responses: no
+ 	iter-scrub-promiscuous: no
  	serve-expired: yes
  	serve-expired-client-timeout: 0
 +	serve-expired-reply-ttl: 123
  	access-control: 127.0.0.1/32 allow_snoop
  	ede: yes
  	ede-serve-expired: yes
diff --cc testdata/serve_expired_0ttl_nodata.rpl
index a53df437a,4d483534d..6c2f6c92f
--- a/testdata/serve_expired_0ttl_nodata.rpl
+++ b/testdata/serve_expired_0ttl_nodata.rpl
@@@ -3,9 -3,9 +3,10 @@@ server
  	module-config: "validator iterator"
  	qname-minimisation: "no"
  	minimal-responses: no
+ 	iter-scrub-promiscuous: no
  	serve-expired: yes
  	serve-expired-client-timeout: 0
 +	serve-expired-reply-ttl: 123
  	ede: yes
  	ede-serve-expired: yes
  
diff --cc testdata/subnet_global_prefetch_always_forward.crpl
index f2c8bdb60,d32ae6da0..a34a314af
--- a/testdata/subnet_global_prefetch_always_forward.crpl
+++ b/testdata/subnet_global_prefetch_always_forward.crpl
@@@ -14,8 -13,7 +14,9 @@@ server
  	access-control: 127.0.0.1 allow_snoop
  	qname-minimisation: no
  	minimal-responses: no
 +	ede: yes
 +	ede-serve-expired: yes
+ 	iter-scrub-promiscuous: no
  
  stub-zone:
  	name: "."