Merge branch 'master' into 4.next

[exim.git] / test / scripts / 0000-Basic / 0901

diff --git a/test/scripts/0000-Basic/0901 b/test/scripts/0000-Basic/0901
index a52359966c3ac19b8c35037db7dc9748b1fc89c4..f5a6fff9a7205811566dc15d7055b19415df6604 100644 (file)
--- a/test/scripts/0000-Basic/0901
+++ b/test/scripts/0000-Basic/0901
@@ -58,8 +58,54 @@ mail from:someone3@some.domain
 rcpt to:CALLER@test.ex
 ??? 250
 bdat 10
-To: Susan@bdat 78 last
+>>> To: Susan@
 ??? 250
+bdat 78 last
+random.com
+From: Sam@random.com
+Subject: This is a bodyless test message
+
+??? 250-
+??? 250
+quit
+??? 221
+****
+#
+# plain, small message (with body)
+# nonlast 1st bdat, noop, last-bdat(0) INCORRECTLY PIPELINED
+# immediate followon 2nd message
+client 127.0.0.1 PORT_D
+??? 220
+ehlo tester
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250 
+mail from:someone2A@some.domain
+??? 250
+rcpt to:CALLER@test.ex
+??? 250
+bdat 100
+To: Susan@random.com
+From: Sam@random.com
+Subject: This is a bodyfull test message
+
+1234567890
+??? 250
+noop
+??? 250
+bdat 0 last
+??? 250-
+??? 250
+mail from:someone3A@some.domain
+??? 250
+rcpt to:CALLER@test.ex
+??? 250
+bdat 10
+>>> To: Susan@
+??? 250
+bdat 78 last
 random.com
 From: Sam@random.com
 Subject: This is a bodyless test message
@@ -197,15 +243,11 @@ ehlo tester
 ??? 250-8BITMIME
 ??? 250-CHUNKING
 ??? 250 HELP
-mail from:someone9@some.domain
+MAIL FROM:someone9@some.domain
 ??? 250
-rcpt to:CALLER@test.ex
+RCPT TO:CALLER@test.ex
 ??? 250
-bdat 1\r\nTbdat 87 last
-To: Susan@random.com
-From: Sam@random.com
-Subject: This is a bodyless test message
-
+BDAT 1\r\nTBDAT 87 last\r\no: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n\r\n
 ??? 554 SMTP synchronization error
 ****
 #