- Move a cache reply callback in worker.c closer to the cache reply

  generation.

diff --git a/daemon/worker.c b/daemon/worker.c
index 34086ce59b6cbd60cf388c1d33125f033d8aa394..ce214380d36d5b45d09271c28ae46446d8f8ae02 100644 (file)
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -742,10 +742,6 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo,
        edns->udp_size = EDNS_ADVERTISED_SIZE;
        edns->ext_rcode = 0;
        edns->bits &= EDNS_DO;
-       if(!inplace_cb_reply_cache_call(&worker->env, qinfo, NULL, rep,
-               (int)(flags&LDNS_RCODE_MASK), edns, repinfo, worker->scratchpad,
-               worker->env.now_tv))
-               goto bail_out;
        *alias_rrset = NULL; /* avoid confusion if caller set it to non-NULL */
        if((worker->daemon->use_response_ip || worker->daemon->use_rpz) &&
                !partial_rep && !apply_respip_action(worker, qinfo, cinfo, rep,
@@ -789,6 +785,10 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo,
                                worker->scratchpad, encode_rep->reason_bogus,
                                encode_rep->reason_bogus_str);
                }
+               if(!inplace_cb_reply_cache_call(&worker->env, qinfo, NULL, encode_rep,
+                       (int)(flags&LDNS_RCODE_MASK), edns, repinfo, worker->scratchpad,
+                       worker->env.now_tv))
+                       goto bail_out;
                if(!reply_info_answer_encode(qinfo, encode_rep, id, flags,
                        repinfo->c->buffer, timenow, 1, worker->scratchpad,
                        udpsize, edns, (int)(edns->bits & EDNS_DO),

diff --git a/doc/Changelog b/doc/Changelog
index 48f8bd59f685ca4f8b9875357db81a23a9a1e7c5..0b35c27b5c97562de28b79ed54b31e3f07674045 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+2 August 2023: George
+       - Move a cache reply callback in worker.c closer to the cache reply
+         generation.
+
 1 August 2023: George
        - Merge #911 from natalie-reece: Exclude EDE before other EDNS options
          when there isn't enough space.