- For caps-for-id fallback, use the whitelist to avoid timeout

  starting a fallback sequence for it.

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

diff --git a/doc/Changelog b/doc/Changelog
index faae871b2a7f63349604434b8d5ea30ae89d7781..73e2d3cfa57e6c161c2228e1b74fc27d2c0f1ca9 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+17 January 2018: Wouter
+       - For caps-for-id fallback, use the whitelist to avoid timeout
+         starting a fallback sequence for it.
+
 16 January 2018: Ralph
        - Get ready for the DNS flag day: remove EDNS lame procedure, do not
          re-query without EDNS after timeout.

diff --git a/iterator/iterator.c b/iterator/iterator.c
index f66381b401fe2256bc2715bf6c1e031e15d57fe3..7a62e128129ccffcaa6015824db55e266cbc9d02 100644 (file)
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -3571,7 +3571,7 @@ process_response(struct module_qstate* qstate, struct iter_qstate* iq,
        if(event == module_event_noreply || event == module_event_error) {
                if(event == module_event_noreply && iq->sent_count >= 3 &&
                        qstate->env->cfg->use_caps_bits_for_id &&
-                       !iq->caps_fallback) {
+                       !iq->caps_fallback && !is_caps_whitelisted(ie, iq)) {
                        /* start fallback */
                        iq->caps_fallback = 1;
                        iq->caps_server = 0;