diff --git a/CHANGES b/CHANGES
index 93b8f440c5..abf6b17c24 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3808. [doc] Clean up "prefetch" documentation. [RT #35751]
+
3807. [bug] Fix sign extention bug in dns_name_fromtext when
lowercase is set. [RT #35743]
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 5a1fcb9b0c..443cef452f 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -4953,6 +4953,8 @@ badresp:1,adberr:0,findfail:0,valfail:0]
resolver-query-timeout number ;
deny-answer-addresses { address_match_list } except-from { namelist } ;
deny-answer-aliases { namelist } except-from { namelist } ;
+ prefetch number number ;
+
rate-limit {
domain domain ;
responses-per-second size number ratio fixedpoint number ;
@@ -4970,13 +4972,18 @@ badresp:1,adberr:0,findfail:0,valfail:0]
exempt-clients { address_match_list } ;
max-table-size number ;
min-table-size number ;
- } ;
- response-policy { zone_name
- policy given | disabled | passthru | drop | nxdomain | nodata | cname domain
- recursive-only yes_or_no max-policy-ttl number ;
- } recursive-only yes_or_no max-policy-ttl number
- break-dnssec yes_or_no min-ns-dots number
- qname-wait-recurse yes_or_no ;
+ } ;
+ response-policy {
+ zone zone_name ;
+ policy given | disabled | passthru | drop | nxdomain | nodata | cname domain ;
+ recursive-only yes_or_no ;
+ max-policy-ttl number ; ;
+ recursive-only yes_or_no ;
+ max-policy-ttl number ;
+ break-dnssec yes_or_no ;
+ min-ns-dots number ;
+ qname-wait-recurse yes_or_no ;
+ } ;
};
@@ -8946,8 +8953,9 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
query will take place: when a cache record with a
lower TTL value is encountered during query processing,
it will be refreshed. Valid trigger TTL values are 1 to
- 10 seconds. Setting a trigger TTL to zero disables
- prefetch.
+ 10 seconds. Setting a trigger TTL to zero (0) causes
+ prefetch to be disabled.
+ The default trigger TTL is 2.
An optional second argument can be used
@@ -8955,12 +8963,8 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
TTL value that will be accepted for a record to be
eligible for prefetching. The difference between
the trigger TTL and the eligibility TTL must be
- at least 6 seconds.
-
-
- The default trigger and eligibility TTLs are
- 2 and 9,
- respectively.
+ at least 6 seconds.
+ The default eligibility TTL is 9.
diff --git a/lib/dns/view.c b/lib/dns/view.c
index f0b323c651..c93a080747 100644
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -190,6 +190,8 @@ dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
view->provideixfr = ISC_TRUE;
view->maxcachettl = 7 * 24 * 3600;
view->maxncachettl = 3 * 3600;
+ view->prefetch_eligible = 0;
+ view->prefetch_trigger = 0;
view->dstport = 53;
view->preferred_glue = 0;
view->flush = ISC_FALSE;