Merge from master into 4.next

[users/jgh/exim.git] / test / stdout / 2015

diff --git a/test/stdout/2015 b/test/stdout/2015
index 4d04859fb232bf4ca931e96a0acc988e59341f1c..42fe5c0fd3bad4b4718240a1849aebd0c4acc07a 100644 (file)
--- a/test/stdout/2015
+++ b/test/stdout/2015
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-STARTTLS
@@ -19,3 +21,23 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 421
 <<< 421 myhost.test.ex: SMTP command timeout - closing connection
 End of script
+Connecting to 127.0.0.1 port 1225 ... connected
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+End of script