- Merge #1027: Introduce 'cache-min-negative-ttl' option.

diff --cc doc/Changelog
index 237dada844a88619cf8b8bf201a6fb0c159bc377,5f7b08ff10ceaea5151c7eec4d3bc6dd10a97a6a..625bd67bfe0b70069712d071e2e07f0aa2b0d596
--- 1/doc/Changelog
--- 2/doc/Changelog
+++ b/doc/Changelog
@@@ -1,75 -1,3 +1,78 @@@
++5 April 2024: Yorgos
++      - Merge #1027: Introduce 'cache-min-negative-ttl' option.
++
 +3 April 2024: Wouter
 +      - Fix #1040: fix heap-buffer-overflow issue in function cfg_mark_ports
 +        of file util/config_file.c.
 +      - For #1040: adjust error text and disallow negative ports in other
 +        parts of cfg_mark_ports.
 +
 +3 April 2024: Yorgos
 +      - Fix #1035: Potential Bug while parsing port from the "stub-host"
 +        string; also affected forward-zones and remote-control host
 +        directives.
 +      - Fix #369: dnstap showing extra responses; for client responses
 +        right from the cache when replying with expired data or
 +        prefetching.
 +
 +28 March 2024: Wouter
 +      - Fix #1034: DoT forward-zone via unbound-control.
 +      - Fix for crypto related failures to have a better error string.
 +
 +27 March 2024: Wouter
 +      - Fix name of unit test for subnet cache response.
 +      - Fix #1032: The size of subnet_msg_cache calculation mistake cause
 +        memory usage increased beyond expectations.
 +      - Fix for #1032, add safeguard to make table space positive.
 +      - Fix comment in lruhash space function.
 +      - Fix to add unit test for lruhash space that exercises the routines.
 +      - Fix that when the server truncates the pidfile, it does not follow
 +        symbolic links.
 +      - Fix that the server does not chown the pidfile.
 +
 +25 March 2024: Yorgos
 +      - Merge #831 from Pierre4012: Improve Windows NSIS installer
 +        script (setup.nsi).
 +      - For #831: Format text, use exclamation icon and explicit label
 +        names.
 +
 +19 March 2024: Wouter
 +      - Fix rpz so that rpz CNAME can apply after rpz CNAME. And fix that
 +        clientip and nsip can give a CNAME.
 +      - Fix localdata and rpz localdata to match CNAME only if no direct
 +        type match is available.
 +
 +18 March 2024: Wouter
 +      - Fix that rpz CNAME content is limited to the max number of cnames.
 +      - Fix rpz, it follows iterator CNAMEs for nsip and nsdname and sets
 +        the reply query_info values, that is better for debug logging.
 +      - Fix rpz that copies the cname override completely to the temp
 +        region, so there are no references to the rpz region.
 +      - Add rpz unit test for nsip action override.
 +      - Fix rpz for qtype CNAME after nameserver trigger.
 +
 +15 March 2024: Yorgos
 +      - Merge #1030: Persist the openssl and expat directories for repeated
 +        Windows builds.
 +
 +15 March 2024: Wouter
 +      - Fix that addrinfo is not kept around but copied and freed, so that
 +        log-destaddr uses a copy of the information, much like NSD does.
 +
 +13 March 2024: Wouter
 +      - Fix #1029: rpz trigger clientip and action rpz-passthru not working
 +        as expected.
 +      - Fix rpz that the rpz override is taken in case of clientip triggers.
 +        Fix that the clientip passthru action is logged. Fix that the
 +        clientip localdata action is logged. Fix rpz override action cname
 +        for the clientip trigger.
 +      - Fix to unify codepath for local alias for rpz cname action override.
 +      - Fix rpz for cname override action after nsdname and nsip triggers.
 +
 +12 March 2024: Yorgos
 +      - Merge #1028: Clearer documentation for tcp-idle-timeout and
 +        edns-tcp-keepalive-timeout.
 +
  11 March 2024: Wouter
        - Fix #1021 Inconsistent Behavior with Changing rpz-cname-override
          and doing a unbound-control reload.

diff --cc doc/example.conf.in
Simple merge

diff --cc doc/unbound.conf.5.in
Simple merge

diff --cc util/config_file.c
Simple merge