rfc2308 compliance.

git-svn-id: file:///svn/unbound/trunk@777 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index ccda8ed2269ed82b9440f507a6dde04474cc6267..1b0d77004e075a9efa74c8b519bc9f51fc73cda6 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+27 November 2007: Wouter
+       - per suggestion in rfc2308, replaced default max-ttl value with 1 day.
+
 22 November 2007: Wouter
        - noted EDNS in-the-middle dropping trouble as a TODO.
          At this point theoretical, no user trouble has been reported.

diff --git a/doc/example.conf b/doc/example.conf
index c62e8cb04c46eda4e44ec3cf1b5c312842334b84..e48cc6933e6f5648d56184b321711ae97603553b 100644 (file)
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -81,7 +81,7 @@ server:
        
        # the time to live (TTL) value cap for RRsets and messages in the
        # cache. Items are not cached for longer. In seconds.
-       # cache-max-ttl: 864000
+       # cache-max-ttl: 86400
 
        # the time to live (TTL) value for cached roundtrip times and
        # EDNS version information for hosts. In seconds.

diff --git a/doc/unbound.conf.5 b/doc/unbound.conf.5
index 97ccc627a4481e74bd9d126b321b8565d7c16d5f..2e82a018f4837c9a7e3ae787048a340285c20780 100644 (file)
--- a/doc/unbound.conf.5
+++ b/doc/unbound.conf.5
@@ -134,7 +134,7 @@ Number of slabs in the RRset cache. Slabs reduce lock contention by threads.
 Must be set to a power of 2. 
 .It \fBcache-max-ttl:\fR <seconds>
 Time to live maximum for RRsets and messages in the cache. Default is 
-864000 seconds (10 days). If the maximum kicks in, responses to clients 
+86400 seconds (1 day). If the maximum kicks in, responses to clients 
 still get decrementing TTLs based on the original (larger) values. 
 When the internal TTL expires, the cache item has expired.
 Can be set lower to force the resolver to query for data often, and not

diff --git a/util/config_file.c b/util/config_file.c
index 61177f709c2ca885d8dc498242828ad136189216..3b57a0e1fbf80fa958f50eeb6d66e534b01d466d 100644 (file)
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -89,7 +89,7 @@ config_create()
        cfg->host_ttl = 900;
        cfg->lame_ttl = 900;
        cfg->bogus_ttl = 900;
-       cfg->max_ttl = 3600 * 24 * 10;
+       cfg->max_ttl = 3600 * 24;
        cfg->infra_cache_slabs = 4;
        cfg->infra_cache_numhosts = 10000;
        cfg->infra_cache_lame_size = 10240; /* easily 40 or more entries */