diff options
author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:23:26 +0100 |
---|---|---|
committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:25:08 +0100 |
commit | 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 (patch) | |
tree | 3f1ff4523e24671e5992008e6ac2d9f299942cfa /test/stderr/2113 | |
parent | 7a28511635d0d5f385a7c389bc5ec95dfed95581 (diff) |
Merge from master into 4.next
Done with git merge --squash -x theirs master
Diffstat (limited to 'test/stderr/2113')
-rw-r--r-- | test/stderr/2113 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/test/stderr/2113 b/test/stderr/2113 index 3efab7e3a..2db86789b 100644 --- a/test/stderr/2113 +++ b/test/stderr/2113 @@ -6,6 +6,7 @@ LOG: queue_run MAIN Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -13,8 +14,10 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-STARTTLS 250 HELP SMTP>> STARTTLS +cmd buf flush ddd bytes SMTP<< 220 TLS go ahead SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -23,17 +26,20 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss SMTP>> RCPT TO:<userx@test.ex> SMTP>> DATA +cmd buf flush ddd bytes SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmaZ-0005vi-00 SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME 250-PIPELINING 250-STARTTLS 250 HELP + SMTP(close)>> LOG: MAIN => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00" LOG: MAIN @@ -43,8 +49,10 @@ configuration file is TESTSUITE/test-config trusted user admin user SMTP>> STARTTLS +cmd buf flush ddd bytes SMTP<< 220 TLS go ahead SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -53,11 +61,14 @@ admin user SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss SMTP>> RCPT TO:<userx@test.ex> SMTP>> DATA +cmd buf flush ddd bytes SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmbA-0005vi-00 SMTP>> QUIT +cmd buf flush ddd bytes + SMTP(close)>> LOG: MAIN => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:AES256-SHA:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" LOG: MAIN |