X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/c2decce2cb31c21601da988ef6ef02bec9073bdd..bec360ab3e1060187724480d109884e56f912b0a:/test/stderr/1150?ds=inline diff --git a/test/stderr/1150 b/test/stderr/1150 index 395644cb1..5d06a61d2 100644 --- a/test/stderr/1150 +++ b/test/stderr/1150 @@ -1,11 +1,13 @@ LOG: queue_run MAIN - Start queue run: pid=pppp -qf -delivering 10HmaX-0005vi-00 (queue run pid ppppp) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected + Start queue run: pid=p1234 -qf +delivering 10HmaX-000000005vi-0000 (queue run pid p1234) +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... +connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO helo.data.changed SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1] 250-SIZE 52428800 + 250-LIMITS MAILMAX=1000 RCPTMAX=50000 250-8BITMIME 250-PIPELINING 250-STARTTLS @@ -15,29 +17,35 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP>> EHLO helo.data.changed SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1] 250-SIZE 52428800 + 250-LIMITS MAILMAX=1000 RCPTMAX=50000 250-8BITMIME 250-PIPELINING 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP>> writing message and terminating "." - SMTP<< 250 OK id=10HmaZ-0005vi-00 + SMTP>> (writing message) + SMTP>> . SMTP>> QUIT + SMTP<< 250 OK id=10HmaZ-000000005vi-0000 + SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> +cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221' LOG: MAIN - => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00" + => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-000000005vi-0000" LOG: MAIN Completed -delivering 10HmaY-0005vi-00 (queue run pid ppppp) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +delivering 10HmaY-000000005vi-0000 (queue run pid p1234) +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... +connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO helo.data.changed SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1] 250-SIZE 52428800 + 250-LIMITS MAILMAX=1000 RCPTMAX=50000 250-8BITMIME 250-PIPELINING 250-STARTTLS @@ -47,30 +55,36 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP>> EHLO helo.data.changed SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1] 250-SIZE 52428800 + 250-LIMITS MAILMAX=1000 RCPTMAX=50000 250-8BITMIME 250-PIPELINING 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP>> writing message and terminating "." - SMTP<< 250 OK id=10HmbA-0005vi-00 + SMTP>> (writing message) + SMTP>> . SMTP>> QUIT + SMTP<< 250 OK id=10HmbA-000000005vi-0000 + SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> +cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT|:RCPT|:DATA:250:250:250:354:.:QUIT:250:221' LOG: MAIN - => CALLER@test.ex R=client T=send_to_server1 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" + => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-000000005vi-0000" LOG: MAIN - -> xyz@test.ex R=client T=send_to_server1 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" -Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected + -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-000000005vi-0000" +Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_D ... +connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 + 250-LIMITS MAILMAX=1000 RCPTMAX=50000 250-8BITMIME 250-PIPELINING 250-STARTTLS @@ -80,24 +94,28 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected SMTP>> EHLO myhost.test.ex SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 + 250-LIMITS MAILMAX=1000 RCPTMAX=50000 250-8BITMIME 250-PIPELINING 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP>> writing message and terminating "." - SMTP<< 250 OK id=10HmbB-0005vi-00 + SMTP>> (writing message) + SMTP>> . SMTP>> QUIT + SMTP<< 250 OK id=10HmbB-000000005vi-0000 + SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> +cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221' LOG: MAIN - => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbB-0005vi-00" + => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbB-000000005vi-0000" LOG: MAIN Completed LOG: queue_run MAIN - End queue run: pid=pppp -qf + End queue run: pid=p1234 -qf ******** SERVER ********