X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/843edb3830b89e01fd2b956d2a0d23d13e29b55e..bbe76e83735d5fa16a0c7b96abd52eaa8d4de203:/test/stderr/1157 diff --git a/test/stderr/1157 b/test/stderr/1157 index 321544e57..2eecddf91 100644 --- a/test/stderr/1157 +++ b/test/stderr/1157 @@ -34,6 +34,7 @@ cmd buf flush ddd bytes SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself + SMTP>> . SMTP<< 250 OK id=10HmbA-0005vi-00 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=10HmbA-0005vi-00" @@ -52,8 +53,10 @@ cmd buf flush ddd bytes SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself + SMTP>> . SMTP<< 250 OK id=10HmbB-0005vi-00 SMTP(close)>> +cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250' 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=no C="250 OK id=10HmbB-0005vi-00" LOG: MAIN @@ -71,16 +74,21 @@ 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=10HmbC-0005vi-00 + SMTP>> . SMTP+> QUIT cmd buf flush ddd bytes (more expected) + SMTP(shutdown)>> + SMTP(TLS shutdown)>> + SMTP<< 250 OK id=10HmbC-0005vi-00 + SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> ->>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> +cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221' 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 >>>>>>>>>>>>>>>> @@ -120,6 +128,7 @@ cmd buf flush ddd bytes SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself + SMTP>> . SMTP<< 250 OK id=10HmbG-0005vi-00 LOG: MAIN => usera@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=yes C="250 OK id=10HmbG-0005vi-00" @@ -138,8 +147,10 @@ cmd buf flush ddd bytes SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself + SMTP>> . SMTP<< 250 OK id=10HmbH-0005vi-00 SMTP(close)>> +cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250' LOG: MAIN => userc@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=10HmbH-0005vi-00" LOG: MAIN @@ -157,16 +168,21 @@ 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=10HmbI-0005vi-00 + SMTP>> . SMTP+> QUIT cmd buf flush ddd bytes (more expected) + SMTP(shutdown)>> + SMTP(TLS shutdown)>> + SMTP<< 250 OK id=10HmbI-0005vi-00 + SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> ->>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> +cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221' 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 >>>>>>>>>>>>>>>> @@ -200,12 +216,13 @@ cmd buf flush ddd bytes 250-PIPELINING 250 HELP SMTP|> MAIL FROM: SIZE=ssss - SMTP|> RCPT TO: + 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>> . SMTP<< 250 OK id=10HmbM-0005vi-00 SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -216,8 +233,9 @@ cmd buf flush ddd bytes 250-STARTTLS 250 HELP SMTP(close)>> +cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250:EHLO:250-' 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 >>>>>>>>>>>>>>>> @@ -237,12 +255,13 @@ cmd buf flush ddd bytes 250-PIPELINING 250 HELP SMTP|> MAIL FROM: SIZE=ssss - SMTP|> RCPT TO: + 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>> . SMTP<< 250 OK id=10HmbN-0005vi-00 SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -253,8 +272,9 @@ cmd buf flush ddd bytes 250-STARTTLS 250 HELP SMTP(close)>> +cmdlog: 'STARTTLS:220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250:EHLO:250-' 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 >>>>>>>>>>>>>>>> @@ -274,18 +294,21 @@ cmd buf flush ddd bytes 250-PIPELINING 250 HELP SMTP|> MAIL FROM: SIZE=ssss - SMTP|> RCPT TO: + 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>> . + SMTP>> QUIT +cmd buf flush ddd bytes SMTP<< 250 OK id=10HmbO-0005vi-00 - SMTP+> QUIT -cmd buf flush ddd bytes (more expected) + SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> +cmdlog: 'STARTTLS:220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221' 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 >>>>>>>>>>>>>>>>