X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/528fde2aff25fbe284332ad2ec4b8cb5fc8c7859..4466248715466b6f251454283642b74de65e9d9a:/test/scripts/5400-cutthrough/5400

diff --git a/test/scripts/5400-cutthrough/5400 b/test/scripts/5400-cutthrough/5400
index 4aa332b86..3e56b43b8 100644
--- a/test/scripts/5400-cutthrough/5400
+++ b/test/scripts/5400-cutthrough/5400
@@ -3,7 +3,7 @@ need_ipv4
 #
 server PORT_S
 220 ESMTP
-HELO
+EHLO
 250 OK
 MAIL FROM:
 250 Sender OK
@@ -18,17 +18,44 @@ QUIT
 ****
 exim -d-all+acl+transport -bs
 EHLO myhost.test.ex
-MAIL FROM:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<userx@domain.com>
 DATA
 
+.
+QUIT
+****
+# cutthrough_delivery into HELO-only server
+server PORT_S
+220 SMTP only spoken here
+EHLO
+550 Not here, mate
+HELO
+250 OK
+MAIL FROM:
+250 Sender OK
+RCPT TO:
+250 Recipient OK
+DATA
+354 Send data
+.
+250 OK
+QUIT
+250 OK
+****
+exim -d-all+acl+transport -bs
+EHLO myhost.test.ex
+MAIL FROM:<CALLER@myhost.test.ex>
+RCPT TO:<userz@domain.com>
+DATA
+
 .
 QUIT
 ****
 # cutthrough cancelled by multiple recipients
 server PORT_S 2
 220 ESMTP
-HELO
+EHLO
 250 OK
 MAIL FROM:
 250 Sender OK
@@ -54,11 +81,45 @@ QUIT
 ****
 exim -d-all+acl+transport -bs
 EHLO myhost.test.ex
-MAIL FROM:<eximtest@myhost.test.ex>
-RCPT TO:<userx@domain.com>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<usery@domain.com>
+RCPT TO:<userx@domain.com>
+DATA
+
+.
+QUIT
+****
+sleep 1
+#
+#
+#
+#
+#
+# cutthrough_delivery basic operation, again
+server PORT_S
+220 ESMTP
+EHLO
+250 OK
+MAIL FROM:
+250 Sender OK
+RCPT TO:
+250 Recipient OK
+DATA
+354 Send data
+.
+250 OK
+QUIT
+250 OK
+****
+exim -d-all+acl+transport -bs
+EHLO myhost.test.ex
+MAIL FROM:<CALLER@myhost.test.ex>
+RCPT TO:<userx@domain.com>
 DATA
+X-hdr-rtr: qqq
+X-hdr-tpt: zzz
 
+body
 .
 QUIT
 ****