pullup:

1053.   [bug]           Dig did not increase its timeout when receiving
                        AXFRs unless the +time option was used. [RT #1904]

diff --git a/CHANGES b/CHANGES
index c43edc2cdd829434aef04f9a47196e26ee34ff20..c5c46ec59182f87dc991e902ad813f1249465f04 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1053.  [bug]           Dig did not increase its timeout when receiving
+                       AXFRs unless the +time option was used. [RT #1904]
+
 1052.  [bug]           Journals were not being created in binary mode
                        resulting in "journal format not recognized" error
                        under Windows NT/2000. [RT #1889]

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 7b3a163dbe34ec8fec5ff7e8c4f11107b2d3fbb5..aaed87a24e0f2c332974e0324a8080d25b333aef 100644 (file)
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.221.2.4 2001/10/11 01:35:37 marka Exp $ */
+/* $Id: dighost.c,v 1.221.2.5 2001/10/15 23:06:07 bwelling Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -2354,9 +2354,9 @@ recv_done(isc_task_t *task, isc_event_t *event) {
 
                        if (timeout == 0) {
                                if (l->tcp_mode)
-                                       local_timeout = TCP_TIMEOUT;
+                                       local_timeout = TCP_TIMEOUT * 4;
                                else
-                                       local_timeout = UDP_TIMEOUT;
+                                       local_timeout = UDP_TIMEOUT * 4;
                        } else {
                                if (timeout < (INT_MAX / 4))
                                        local_timeout = timeout * 4;