From 5032d1cf500b102849d9a47867fbb7b34d871683 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 13 Jan 2015 11:19:32 +0000 Subject: Multi-recipient cutthrough delivery. Bug 1542 Testing and fixes by: Heiko Schlittermann --- test/stderr/5400 | 235 ------------------------------------------------------- 1 file changed, 235 deletions(-) delete mode 100644 test/stderr/5400 (limited to 'test/stderr/5400') diff --git a/test/stderr/5400 b/test/stderr/5400 deleted file mode 100644 index 9fa77d5f2..000000000 --- a/test/stderr/5400 +++ /dev/null @@ -1,235 +0,0 @@ -Exim version x.yz .... -configuration file is TESTSUITE/test-config -admin user -LOG: smtp_connection MAIN - SMTP connection from CALLER -using ACL "ar" -processing "accept" -check control = cutthrough_delivery -check logwrite = rcpt for $local_part@$domain - = rcpt for userx@domain.com -LOG: MAIN - rcpt for userx@domain.com -created log directory TESTSUITE/spool/log -accept: condition test succeeded in ACL "ar" -end of ACL "ar": ACCEPT ------------ start cutthrough setup ------------ -Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected - SMTP<< 220 ESMTP - SMTP>> EHLO myhost.test.ex - SMTP<< 250 OK - SMTP>> MAIL FROM: - SMTP<< 250 Sender OK - SMTP>> RCPT TO: - SMTP<< 250 Recipient OK ------------ end cutthrough setup ------------ -processing "accept" -accept: condition test succeeded in inline ACL -end of inline ACL: ACCEPT - SMTP>> DATA - SMTP<< 354 Send data ------------ start cutthrough headers send ----------- -added header line(s): -X-hdr-rtr-new: +++ ---- ------------ done cutthrough headers send ------------ - SMTP>> . - SMTP<< 250 OK -LOG: MAIN - >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" - SMTP>> QUIT ------------ cutthrough shutdown (delivered) ------------ -LOG: MAIN - <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss -LOG: MAIN - Completed -LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> -Exim version x.yz .... -configuration file is TESTSUITE/test-config -admin user -LOG: smtp_connection MAIN - SMTP connection from CALLER -using ACL "ar" -processing "accept" -check control = cutthrough_delivery -check logwrite = rcpt for $local_part@$domain - = rcpt for userz@domain.com -LOG: MAIN - rcpt for userz@domain.com -accept: condition test succeeded in ACL "ar" -end of ACL "ar": ACCEPT ------------ start cutthrough setup ------------ -Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected - SMTP<< 220 SMTP only spoken here - SMTP>> EHLO myhost.test.ex - SMTP<< 550 Not here, mate - SMTP>> HELO myhost.test.ex - SMTP<< 250 OK - SMTP>> MAIL FROM: - SMTP<< 250 Sender OK - SMTP>> RCPT TO: - SMTP<< 250 Recipient OK ------------ end cutthrough setup ------------ -processing "accept" -accept: condition test succeeded in inline ACL -end of inline ACL: ACCEPT - SMTP>> DATA - SMTP<< 354 Send data ------------ start cutthrough headers send ----------- -added header line(s): -X-hdr-rtr-new: +++ ---- ------------ done cutthrough headers send ------------ - SMTP>> . - SMTP<< 250 OK -LOG: MAIN - >> userz@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" - SMTP>> QUIT ------------ cutthrough shutdown (delivered) ------------ -LOG: MAIN - <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss -LOG: MAIN - Completed -LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> -Exim version x.yz .... -configuration file is TESTSUITE/test-config -admin user -LOG: smtp_connection MAIN - SMTP connection from CALLER -using ACL "ar" -processing "accept" -check control = cutthrough_delivery -check logwrite = rcpt for $local_part@$domain - = rcpt for usery@domain.com -LOG: MAIN - rcpt for usery@domain.com -accept: condition test succeeded in ACL "ar" -end of ACL "ar": ACCEPT ------------ start cutthrough setup ------------ -Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected - SMTP<< 220 ESMTP - SMTP>> EHLO myhost.test.ex - SMTP<< 250 OK - SMTP>> MAIL FROM: - SMTP<< 250 Sender OK - SMTP>> RCPT TO: - SMTP<< 250 Recipient OK ------------ end cutthrough setup ------------ -using ACL "ar" -processing "accept" -check control = cutthrough_delivery -check logwrite = rcpt for $local_part@$domain - = rcpt for userx@domain.com -LOG: MAIN - rcpt for userx@domain.com -accept: condition test succeeded in ACL "ar" -end of ACL "ar": ACCEPT - SMTP>> QUIT ------------ cutthrough shutdown (more than one recipient) ------------ -LOG: MAIN - <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss -LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> -Exim version x.yz .... -configuration file is TESTSUITE/test-config -trusted user -admin user ->>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> ---------> usery@domain.com <-------- -smtp transport entered - usery@domain.com - userx@domain.com -checking status of 127.0.0.1 -127.0.0.1 [127.0.0.1]:1111 status = usable -delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (usery@domain.com, ...) -Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected - SMTP<< 220 ESMTP - SMTP>> EHLO myhost.test.ex - SMTP<< 250 OK -not using PIPELINING -use_dsn=0 - SMTP>> MAIL FROM: - SMTP<< 250 Sender OK - SMTP>> RCPT TO: - SMTP<< 250 Recipient OK - SMTP>> RCPT TO: - SMTP<< 250 Recipient OK - SMTP>> DATA - SMTP<< 354 Send data - SMTP>> writing message and terminating "." -added header line(s): -X-hdr-rtr-new: +++ ---- -writing data block fd=dddd size=sss timeout=300 - SMTP<< 250 OK -ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL -transport_check_waiting entered - sequence=1 local_max=500 global_max=-1 -no messages waiting for 127.0.0.1 - SMTP>> QUIT -Leaving smtp transport -LOG: MAIN - => usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" -LOG: MAIN - -> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" -LOG: MAIN - Completed ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> -Exim version x.yz .... -configuration file is TESTSUITE/test-config -admin user -LOG: smtp_connection MAIN - SMTP connection from CALLER -using ACL "ar" -processing "accept" -check control = cutthrough_delivery -check logwrite = rcpt for $local_part@$domain - = rcpt for userx@domain.com -LOG: MAIN - rcpt for userx@domain.com -accept: condition test succeeded in ACL "ar" -end of ACL "ar": ACCEPT ------------ start cutthrough setup ------------ -Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected - SMTP<< 220 ESMTP - SMTP>> EHLO myhost.test.ex - SMTP<< 250 OK - SMTP>> MAIL FROM: - SMTP<< 250 Sender OK - SMTP>> RCPT TO: - SMTP<< 250 Recipient OK ------------ end cutthrough setup ------------ -processing "accept" -accept: condition test succeeded in inline ACL -end of inline ACL: ACCEPT - SMTP>> DATA - SMTP<< 354 Send data ------------ start cutthrough headers send ----------- -removed header line: -X-hdr-rtr: qqq ---- -added header line(s): -X-hdr-rtr-new: +++ ---- -added header line: -X-hdr-tpt-new: new ---- ------------ done cutthrough headers send ------------ - SMTP>> . - SMTP<< 250 OK -LOG: MAIN - >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" - SMTP>> QUIT ------------ cutthrough shutdown (delivered) ------------ -LOG: MAIN - <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss -LOG: MAIN - Completed -LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> -- cgit v1.2.3