From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 24 Oct 2016 12:53:13 +0000 (+0000)
Subject: Fixup prefetch only when needed
X-Git-Tag: release-1.6.0rc1~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4fae019de2a651fdb698d070802fdc28e1989ba;p=thirdparty%2Funbound.git

Fixup prefetch only when needed


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

diff --git a/daemon/worker.c b/daemon/worker.c
index 59fccf553..3c50567e4 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -1027,9 +1027,9 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 			sldns_buffer_read_u16_at(c->buffer, 2), repinfo, 
 			&edns)) {
 			/* prefetch it if the prefetch TTL expired */
-			if((worker->env.cfg->prefetch && *worker->env.now >=
-				((struct reply_info*)e->data)->prefetch_ttl)
-				|| worker->env.cfg->serve_expired) {
+			if((worker->env.cfg->prefetch || worker->env.cfg->serve_expired)
+				&& *worker->env.now >=
+				((struct reply_info*)e->data)->prefetch_ttl) {
 				time_t leeway = ((struct reply_info*)e->
 					data)->ttl - *worker->env.now;
 				if(((struct reply_info*)e->data)->ttl