upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix the relationship between serve-expired and prefetch options,

Browse source 
patch from Saksham Manchanda from Secure64.
This commit is contained in:
W.C.A. Wijngaards 2020-01-10 10:04:50 +01:00
parent 92a525225b
commit a8db52120b
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
daemon/worker.c
View file

@ -1468,9 +1468,11 @@ lookup_cache:
* Note that if there is more than one pass * Note that if there is more than one pass
* its qname must be that used for cache * its qname must be that used for cache
* lookup. */ * lookup. */
if((worker->env.cfg->prefetch || worker->env.cfg->serve_expired) if((worker->env.cfg->prefetch && *worker->env.now >=
&& *worker->env.now >= ((struct reply_info*)e->data)->prefetch_ttl) ||
((struct reply_info*)e->data)->prefetch_ttl) { (worker->env.cfg->serve_expired &&
*worker->env.now >= ((struct reply_info*)e->data)->ttl)) {
time_t leeway = ((struct reply_info*)e-> time_t leeway = ((struct reply_info*)e->
data)->ttl - *worker->env.now; data)->ttl - *worker->env.now;
if(((struct reply_info*)e->data)->ttl if(((struct reply_info*)e->data)->ttl

4
doc/Changelog
View file

@ -1,3 +1,7 @@
10 January 2020: Wouter
- Fix the relationship between serve-expired and prefetch options,
patch from Saksham Manchanda from Secure64.
8 January 2020: Ralph 8 January 2020: Ralph
- Fix #138: stop binding pidfile inside chroot dir in systemd service - Fix #138: stop binding pidfile inside chroot dir in systemd service
file. file.