[exim-cvs] Avoid clearing first_delivery flag on the initial…

Αρχική Σελίδα
Delete this message
Reply to this message
Συντάκτης: Exim Git Commits Mailing List
Ημερομηνία:  
Προς: exim-cvs
Αντικείμενο: [exim-cvs] Avoid clearing first_delivery flag on the initial half of a 2-phase queue run
Gitweb: https://git.exim.org/exim.git/commitdiff/e4e884faa7f5a04d937282113681d97a355ed2af
Commit:     e4e884faa7f5a04d937282113681d97a355ed2af
Parent:     9aba085b920ab3b8cdd1085db917145785ca24cf
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Mon Mar 22 21:47:42 2021 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Mon Mar 22 21:47:42 2021 +0000


    Avoid clearing first_delivery flag on the initial half of a 2-phase queue run
---
 src/src/deliver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


diff --git a/src/src/deliver.c b/src/src/deliver.c
index 29e2b71..ec39cf1 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;