From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Mon, 22 Mar 2021 21:47:42 +0000 (+0000)
Subject: Avoid clearing first_delivery flag on the initial half of a 2-phase queue run
X-Git-Tag: exim-4.95-RC0~98
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/e4e884faa7f5a04d937282113681d97a355ed2af

Avoid clearing first_delivery flag on the initial half of a 2-phase queue run
---

diff --git a/src/src/deliver.c b/src/src/deliver.c
index 29e2b719d..ec39cf15e 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -8416,7 +8416,7 @@ else if (addr_defer != (address_item *)(+1))
   /* If this was a first delivery attempt, unset the first time flag, and
   ensure that the spool gets updated. */
 
-  if (f.deliver_firsttime)
+  if (f.deliver_firsttime && !f.queue_2stage)
     {
     f.deliver_firsttime = FALSE;
     update_spool = TRUE;