2433. [tuning] Set initial timeout to 800ms.

diff --git a/CHANGES b/CHANGES
index 87eea50623403ce0113855144f17a7cc6b8d2231..a2d19987c2fff5aeab93f0b3b7a8c11a71d4f162 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2433.  [tuning]        Set initial timeout to 800ms.
+
 2432.   [placeholder]
 
 2431.  [bug]           Acl processing could leak memory. [RT #18323]
@@ -108,6 +110,10 @@
 
 2397.  [bug]           gssapi_functions had too many elements. [RT #18355]
 
+       [bug]           Improve file descriptor management.  New,
+                       temporary, named.conf option reserved-sockets,
+                       default 512. [RT #18344]
+
 2396.  [bug]           Don't set SO_REUSEADDR for randomized ports.
                        [RT #18336]
 

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 30465ecb67d1d096f54681d804cef7bbbd9c7282..08bb64591f190a31ecbd745ca9588047a371e6e4 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.379 2008/08/22 23:47:17 tbox Exp $ */
+/* $Id: resolver.c,v 1.380 2008/09/04 04:23:43 marka Exp $ */
 
 /*! \file */
 
@@ -1121,9 +1121,9 @@ fctx_setretryinterval(fetchctx_t *fctx, unsigned int rtt) {
         * list, and then we do exponential back-off.
         */
        if (fctx->restarts < 3)
-               us = 500000;
+               us = 800000;
        else
-               us = (500000 << (fctx->restarts - 2));
+               us = (800000 << (fctx->restarts - 2));
 
        /*
         * Double the round-trip time.