summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2020-12-20 15:49:39 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2020-12-20 15:51:00 +0000
commit94ecf089d68ac5b85c2a99177a8e4b4d35d5aa2e (patch)
tree11c435b84c49a91dc0848b984990fe4ba20ee8d5 /doc
parent46694b802ce0302f3c3344be933cc9737d4d4f4c (diff)
Fix local delivery delay when combined with remote callout/hold. Bug 2599
Diffstat (limited to 'doc')
-rw-r--r--doc/doc-docbook/spec.xfpt4
-rw-r--r--doc/doc-txt/ChangeLog3
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 302a62312..2938de576 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -3885,7 +3885,9 @@ id, and the remaining ones must be email addresses. However, if the message is
active (in the middle of a delivery attempt), it is not altered. This option
can be used only by an admin user.
-.vitem "&%-MC%&&~<&'transport'&>&~<&'hostname'&>&~<&'sequence&~number'&>&&&
+.vitem "&%-MC%&&~<&'transport'&>&~<&'hostname'&>&&&
+ &~<&'host&~IP'&>&&&
+ &~<&'sequence&~number'&>&&&
&~<&'message&~id'&>"
.oindex "&%-MC%&"
.cindex "SMTP" "passed connection"
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index f2d34e84d..396ec3362 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -156,6 +156,9 @@ JH/31 The ESMTP option name advertised for the SUPPORT_EARLY_PIPE build option
Changeover between the implementations is handled by the mechanisms
alrready coded.
+JH/32 Bug 2599: fix delay of delivery to a local address where there is also
+ a remote which uses callout/hold. Previously the local was queued.
+
Exim version 4.94
-----------------