- 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 6d7810035704a6d8f4888ecf1b0e1188695dbb4f..28a3016801dac3cc3fc31c2d82550087e1440e0d 100644 (file)
--- 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 ff709186f7403970dda6461c73cf44512272f28a..ee04339eeef2682aff0b45347b30d96282a40da4 100644 (file)
--- 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 */