X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/c2decce2cb31c21601da988ef6ef02bec9073bdd..825a1c76acc35d17b2678c42bc9339559bb8a9bb:/test/stderr/1157?ds=inline diff --git a/test/stderr/1157 b/test/stderr/1157 index 368ccc07d..d5274fb8e 100644 --- a/test/stderr/1157 +++ b/test/stderr/1157 @@ -27,8 +27,8 @@ cmd buf flush ddd bytes 250-8BITMIME 250-PIPELINING 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA cmd buf flush ddd bytes SMTP<< 250 OK @@ -45,8 +45,8 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA cmd buf flush ddd bytes SMTP<< 250 OK @@ -64,23 +64,26 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: 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+> QUIT +cmd buf flush ddd bytes (more expected) + SMTP(shutdown)>> + SMTP(TLS shutdown)>> SMTP<< 250 OK id=10HmbC-0005vi-00 - SMTP>> QUIT -cmd buf flush ddd bytes + SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> ->>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN End queue run: pid=pppp -qqf >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -113,8 +116,8 @@ cmd buf flush ddd bytes 250-8BITMIME 250-PIPELINING 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA cmd buf flush ddd bytes SMTP<< 250 OK @@ -131,8 +134,8 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA cmd buf flush ddd bytes SMTP<< 250 OK @@ -150,23 +153,26 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: 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+> QUIT +cmd buf flush ddd bytes (more expected) + SMTP(shutdown)>> + SMTP(TLS shutdown)>> SMTP<< 250 OK id=10HmbI-0005vi-00 - SMTP>> QUIT -cmd buf flush ddd bytes + SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> ->>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN => userb@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbI-0005vi-00" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN End queue run: pid=pppp -qqf >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -199,8 +205,8 @@ cmd buf flush ddd bytes 250-8BITMIME 250-PIPELINING 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA cmd buf flush ddd bytes SMTP<< 250 OK @@ -217,7 +223,7 @@ cmd buf flush ddd bytes 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=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbM-0005vi-00" + => user_p@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbM-0005vi-00" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -236,8 +242,8 @@ cmd buf flush ddd bytes 250-8BITMIME 250-PIPELINING 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA cmd buf flush ddd bytes SMTP<< 250 OK @@ -254,7 +260,7 @@ cmd buf flush ddd bytes 250 HELP SMTP(close)>> LOG: MAIN - => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbN-0005vi-00" + => user_r@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbN-0005vi-00" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -273,19 +279,20 @@ cmd buf flush ddd bytes 250-8BITMIME 250-PIPELINING 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: 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=10HmbO-0005vi-00 SMTP>> QUIT cmd buf flush ddd bytes + SMTP<< 250 OK id=10HmbO-0005vi-00 + SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> LOG: MAIN - => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbO-0005vi-00" + => user_q@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbO-0005vi-00" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>