stale-cache-enable is enabled by default

Because this is a backport, the option should default to keep the
serve-stale caching enabled.

diff --git a/bin/named/config.c b/bin/named/config.c
index 8685c9543cc72821aa47dbef5e01130a07a9d591..10a16f860a63296578338ca2b3384587768fff61 100644 (file)
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -195,7 +195,7 @@ options {\n\
 #      sortlist <none>\n\
        stale-answer-enable false;\n\
        stale-answer-ttl 1; /* 1 second */\n\
-       stale-cache-enable false;\n\
+       stale-cache-enable true;\n\
        synth-from-dnssec no;\n\
 #      topology <none>\n\
        transfer-format many-answers;\n\

diff --git a/bin/tests/system/serve-stale/ns3/named.conf.in b/bin/tests/system/serve-stale/ns3/named.conf.in
index d5943a9a0233501bbf63a068f95c51063963e17c..4d3cab3977ce2f4d04d34c035e52a8113863201a 100644 (file)
--- a/bin/tests/system/serve-stale/ns3/named.conf.in
+++ b/bin/tests/system/serve-stale/ns3/named.conf.in
@@ -28,7 +28,6 @@ options {
        listen-on-v6 { none; };
        recursion yes;
        dump-file "named_dump3.db";
-       stale-cache-enable yes;
 };
 
 zone "." {

diff --git a/bin/tests/system/serve-stale/ns4/named.conf.in b/bin/tests/system/serve-stale/ns4/named.conf.in
index 9c502ba0e41c1b5e226206ee3dbb923dde1f3f45..cd255b06d441d6c2ce89dc2a73895627588f6cbc 100644 (file)
--- a/bin/tests/system/serve-stale/ns4/named.conf.in
+++ b/bin/tests/system/serve-stale/ns4/named.conf.in
@@ -29,7 +29,6 @@ options {
        recursion yes;
        dump-file "named_dump4.db";
        stale-answer-enable no;
-       stale-cache-enable yes;
 };
 
 zone "." {

diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index 84f7e3a18d17adc377b61eb7a32cd5213105a16f..c0d6a84a4e10265b31a40bce4cf0785c5219b753 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -1837,7 +1837,7 @@ Boolean Options
    log category.
 
 ``stale-cache-enable``
-   If ``yes``, enable the retaining of "stale" cached answers.  Default ``no``.
+   If ``yes``, enable the retaining of "stale" cached answers.  Default ``yes``.
 
 ``nocookie-udp-size``
    This sets the maximum size of UDP responses that are sent to queries

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 25cb1648e8406a02ff833c738e207c5c2626ff10..d316b8b9966bc6240fd7c69d16e6cd03bbbb4d2d 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -39,8 +39,6 @@ Feature Changes
   prevents interruption to query resolution when the hash tables need to be
   increased in size. [GL #1775]
 
-- Keeping stale answers in cache has been disabled by default.
-
 - The resource records received with 0 TTL are no longer kept in the cache
   to be used for stale answers. [GL #1829]