From: Wouter Wijngaards Date: Mon, 24 Oct 2011 08:34:59 +0000 (+0000) Subject: - Fix resolve of partners.extranet.microsoft.com with a fix for the X-Git-Tag: release-1.4.14rc1~45 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ea69fe9c2954599c749ce3fc2d1412ba2551199;p=thirdparty%2Funbound.git - Fix resolve of partners.extranet.microsoft.com with a fix for the server selection for choosing out of a (particular) list of bad choices. git-svn-id: file:///svn/unbound/trunk@2522 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/doc/Changelog b/doc/Changelog index 6d7810035..28a301680 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,8 @@ +24 October 2011: Wouter + - Fix resolve of partners.extranet.microsoft.com with a fix for the + server selection for choosing out of a (particular) list of bad + choices. + 21 October 2011: Wouter - fix --enable-allsymbols, fptr wlist is disabled on windows with this option enabled because of memory layout exe vs dll. diff --git a/iterator/iter_utils.c b/iterator/iter_utils.c index ff709186f..ee04339ee 100644 --- a/iterator/iter_utils.c +++ b/iterator/iter_utils.c @@ -212,8 +212,13 @@ iter_filter_unsuitable(struct iter_env* iter_env, struct module_env* env, if(lame) return -1; /* server is lame */ else if(rtt >= USEFUL_SERVER_TOP_TIMEOUT) - /* server is unresponsive */ - return USEFUL_SERVER_TOP_TIMEOUT; + /* server is unresponsive, + * we used to return TOP_TIMOUT, but fairly useless, + * because if == TOP_TIMEOUT is dropped because + * blacklisted later, instead, remove it here, so + * other choices (that are not blacklisted) can be + * tried */ + return -1; /* select remainder from worst to best */ else if(reclame) return rtt+USEFUL_SERVER_TOP_TIMEOUT*3; /* nonpref */