X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/001bf8f58763581d117edaa391aa13ac139eb39b..fed38d88886d069738a444110f10b0c60d867ac0:/test/stderr/0911?ds=sidebyside diff --git a/test/stderr/0911 b/test/stderr/0911 index 6a6645ded..e80deaa6b 100644 --- a/test/stderr/0911 +++ b/test/stderr/0911 @@ -18,10 +18,10 @@ send_to_server transport entered good@test.ex using the transport's hosts: 127.0.0.1 getting address for 127.0.0.1 -checking status of 127.0.0.1 +checking retry status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (good@test.ex) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (good@test.ex) +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -40,7 +40,7 @@ transport_check_waiting entered no messages waiting for 127.0.0.1 transport_check_waiting: FALSE will pipeline QUIT - SMTP+> BDAT 313 LAST + SMTP+> BDAT 329 LAST cmd buf flush ddd bytes (more expected) cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=300 (more expected) @@ -55,15 +55,16 @@ sync_responses expect rcpt for good@test.ex ok=1 send_quit=0 send_rset=0 continue_more=0 yield=0 first_address is NULL SMTP<< 221 Closing connection SMTP(close)>> +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT:QUIT:250:250:250:221' Leaving send_to_server transport LOG: MAIN => good@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L K C="250 OK chunked message data" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + SMTP connection from root D=q.qqqs closed by QUIT +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -83,10 +84,10 @@ send_to_server transport entered nopipe@test.ex using the transport's hosts: 127.0.0.1 getting address for 127.0.0.1 -checking status of 127.0.0.1 +checking retry status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmaY-0005vi-00 to 127.0.0.1 [127.0.0.1] (nopipe@test.ex) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +delivering 10HmaY-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (nopipe@test.ex) +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -104,7 +105,7 @@ cmd buf flush ddd bytes sync_responses expect rcpt for nopipe@test.ex SMTP<< 250 OK rcpt will write message using CHUNKING - SMTP+> BDAT 315 LAST + SMTP+> BDAT 331 LAST cmd buf flush ddd bytes (more expected) cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=300 @@ -119,15 +120,16 @@ cmd buf flush ddd bytes (more expected) SMTP(shutdown)>> SMTP<< 221 Closing connection SMTP(close)>> +cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:BDAT:250:QUIT:221' Leaving send_to_server transport LOG: MAIN => nopipe@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] K C="250 OK chunked message data" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + SMTP connection from root D=q.qqqs closed by QUIT +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -147,10 +149,10 @@ send_to_server transport entered tempreject@test.ex using the transport's hosts: 127.0.0.1 getting address for 127.0.0.1 -checking status of 127.0.0.1 +checking retry status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (tempreject@test.ex) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (tempreject@test.ex) +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -169,7 +171,7 @@ transport_check_waiting entered no messages waiting for 127.0.0.1 transport_check_waiting: FALSE will pipeline QUIT - SMTP+> BDAT 319 LAST + SMTP+> BDAT 335 LAST cmd buf flush ddd bytes (more expected) cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=300 (more expected) @@ -186,15 +188,16 @@ LOG: MAIN ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP<< 221 Closing connection SMTP(close)>> -added retry item for T:127.0.0.1:127.0.0.1:1225:10HmaZ-0005vi-00: errno=-46 more_errno=dd,A flags=6 +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT:QUIT:250:250:451:221' +added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmaZ-000000005vi-0000: errno=-46 more_errno=dd,A flags=6 all IP addresses skipped or deferred at least one address Leaving send_to_server transport LOG: MAIN == tempreject@test.ex R=client T=send_to_server defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 451 Service not available ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + SMTP connection from root D=q.qqqs closed by QUIT +>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -214,12 +217,12 @@ send_to_server transport entered permreject@test.ex using the transport's hosts: 127.0.0.1 getting address for 127.0.0.1 -checking status of 127.0.0.1 +checking retry status of 127.0.0.1 no host retry record no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmbA-0005vi-00 to 127.0.0.1 [127.0.0.1] (permreject@test.ex) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +delivering 10HmbA-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (permreject@test.ex) +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -238,7 +241,7 @@ transport_check_waiting entered no messages waiting for 127.0.0.1 transport_check_waiting: FALSE will pipeline QUIT - SMTP+> BDAT 319 LAST + SMTP+> BDAT 335 LAST cmd buf flush ddd bytes (more expected) cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=300 (more expected) @@ -253,6 +256,7 @@ sync_responses expect rcpt for permreject@test.ex ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP<< 221 Closing connection SMTP(close)>> +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT:QUIT:250:250:550:221' Leaving send_to_server transport LOG: MAIN ** permreject@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 550 content rejected @@ -260,10 +264,10 @@ LOG: MAIN permreject@test.ex: error ignored LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1241 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + SMTP connection from root D=q.qqqs closed by QUIT +>>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -283,12 +287,12 @@ send_to_server transport entered dataloss@test.ex using the transport's hosts: 127.0.0.1 getting address for 127.0.0.1 -checking status of 127.0.0.1 +checking retry status of 127.0.0.1 no host retry record no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmbB-0005vi-00 to 127.0.0.1 [127.0.0.1] (dataloss@test.ex) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +delivering 10HmbB-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (dataloss@test.ex) +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -307,7 +311,7 @@ transport_check_waiting entered no messages waiting for 127.0.0.1 transport_check_waiting: FALSE will pipeline QUIT - SMTP+> BDAT 317 LAST + SMTP+> BDAT 333 LAST cmd buf flush ddd bytes (more expected) cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=300 (more expected) @@ -324,12 +328,13 @@ LOG: MAIN ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP(closed)<< SMTP(close)>> -added retry item for T:127.0.0.1:127.0.0.1:1225:10HmbB-0005vi-00: errno=-18 more_errno=dd,A flags=6 +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT:QUIT:250:250' +added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmbB-000000005vi-0000: errno=-18 more_errno=dd,A flags=6 all IP addresses skipped or deferred at least one address Leaving send_to_server transport LOG: MAIN == dataloss@test.ex R=client T=send_to_server defer (-18) H=127.0.0.1 [127.0.0.1]: Remote host closed connection in response to pipelined end of data ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1243 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + SMTP connection from root D=q.qqqs closed by QUIT +>>>>>>>>>>>>>>>> Exim pid=p1242 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>