From: Wouter Wijngaards Date: Thu, 17 Jan 2019 08:50:25 +0000 (+0000) Subject: - For caps-for-id fallback, use the whitelist to avoid timeout X-Git-Tag: release-1.9.0rc1~46 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=762920232a5d8e6ddfac5ab9eaa14a09d7d089e2;p=thirdparty%2Funbound.git - 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 faae871b2..73e2d3cfa 100644 --- 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 f66381b40..7a62e1281 100644 --- 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;