tidying

[exim.git] / test / scripts / 5400-cutthrough / 5400

diff --git a/test/scripts/5400-cutthrough/5400 b/test/scripts/5400-cutthrough/5400
index 5344ba51c6db4cd77ce0bbb5bd3f42be580a2405..10406c2557220c20a76e21a1e99be65d8d244a57 100644 (file)
--- a/test/scripts/5400-cutthrough/5400
+++ b/test/scripts/5400-cutthrough/5400
@@ -120,8 +120,7 @@ QUIT
 #
 # cutthrough for 2 recipients in one domain
 # first one denied
 #
 # cutthrough for 2 recipients in one domain
 # first one denied

-# so we get a 2nd conn with the traditional delivery
-# (for both because it's not a real verify=recipient)
+# so we get a 2nd conn with the traditional delivery for the second

 server PORT_S 2
 220 ESMTP
 EHLO
 server PORT_S 2
 220 ESMTP
 EHLO


@@ -140,8 +139,6 @@ MAIL FROM:
 250 Sender OK
 RCPT TO:
 250 ok rcpt-1
 250 Sender OK
 RCPT TO:
 250 ok rcpt-1

-RCPT TO:
-250 ok rcpt-2

 DATA
 354 Send data
 .
 DATA
 354 Send data
 .


@@ -168,8 +165,7 @@ QUIT
 #
 # cutthrough for 2 recipients in one domain
 # second one denied
 #
 # cutthrough for 2 recipients in one domain
 # second one denied

-# so we get a 2nd conn with the traditional delivery
-# (for both because it's not a real verify=recipient)
+# so we get a 2nd conn with the traditional delivery of the 1st

 server PORT_S 2
 220 ESMTP
 EHLO
 server PORT_S 2
 220 ESMTP
 EHLO


@@ -190,8 +186,6 @@ MAIL FROM:
 250 Sender OK
 RCPT TO:
 250 ok rcpt-1
 250 Sender OK
 RCPT TO:
 250 ok rcpt-1

-RCPT TO:
-250 ok rcpt-2

 DATA
 354 Send data
 .
 DATA
 354 Send data
 .


@@ -414,5 +408,40 @@ QUIT
 #
 #
 #
 #
 #
 #

+# data having line with (logical, doubled on wire) single dot
+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 -bs -odf
+EHLO myhost.test.ex
+MAIL FROM:<CALLER@myhost.test.ex>
+RCPT TO:<userx@domain.com>
+DATA
+Subject: singledot test
+
+This data has a line with a single dot... next:
+..
+and this is the line right after.
+Next we have a line with a leading dot:
+..test
+and this is the next line.
+
+.
+QUIT
+****
+#

 #
 #

+sortlog

 # End
 # End