From: Philip Hazel <ph10@hermes.cam.ac.uk>
Date: Thu, 16 Feb 2006 16:37:57 +0000 (+0000)
Subject: A tweak to the "H" retry rule from Michael Haardt.
X-Git-Tag: exim-4_61~48
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/3cd34f132a0cb73534aa479e16533771bc6cb6aa

A tweak to the "H" retry rule from Michael Haardt.
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index c0df4a91f..2a00f1830 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.305 2006/02/16 14:54:15 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.306 2006/02/16 16:37:57 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -193,6 +193,8 @@ PH/37 When running in the test harness, use -odi for submitted messages (e.g.
 
 PH/38 Panic-die if .include specifies a non-absolute path.
 
+PH/39 A tweak to the "H" retry rule from its user.
+
 
 Exim version 4.60
 -----------------
diff --git a/src/src/retry.c b/src/src/retry.c
index eb4cd46cc..dbfd3cee8 100644
--- a/src/src/retry.c
+++ b/src/src/retry.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/retry.c,v 1.7 2006/02/09 14:50:58 ph10 Exp $ */
+/* $Cambridge: exim/src/src/retry.c,v 1.8 2006/02/16 16:37:57 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -798,7 +798,8 @@ for (i = 0; i < 3; i++)
               {
               next_try = now + rule->p1;
               if (next_gap > rule->p1)
-                next_try += random_number(next_gap - rule->p1);
+                next_try += random_number(next_gap - rule->p1)/2 +
+                  (next_gap - rule->p1)/2;
               }
             }
           }