From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 4 Jun 2019 13:18:59 +0000 (+0100)
Subject: Events: avoid evaluating intermediates for unneeded events
X-Git-Tag: exim-4.93-RC0~164
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/7a9e0ae14e5544e8377d1f91298d0ec9a482bf12

Events: avoid evaluating intermediates for unneeded events
---

diff --git a/src/src/deliver.c b/src/src/deliver.c
index b26e5dbd4..dc2e577dd 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -6244,7 +6244,7 @@ if (process_recipients != RECIP_IGNORE)
         }
 
 #ifndef DISABLE_EVENT
-      if (process_recipients != RECIP_ACCEPT)
+      if (process_recipients != RECIP_ACCEPT && event_action)
 	{
 	uschar * save_local =  deliver_localpart;
 	const uschar * save_domain = deliver_domain;
diff --git a/src/src/queue.c b/src/src/queue.c
index 89ac87f94..f54124c5e 100644
--- a/src/src/queue.c
+++ b/src/src/queue.c
@@ -1252,7 +1252,7 @@ switch(action)
     if (removed)
       {
 #ifndef DISABLE_EVENT
-      for (int i = 0; i < recipients_count; i++)
+      if (event_action) for (int i = 0; i < recipients_count; i++)
 	{
 	tree_node *delivered =
 	  tree_search(tree_nonrecipients, recipients_list[i].address);