X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/e4a235601e45bd946f0f01870cd89bfaf3c74684..b3c1e80e7d0d7d7eeb6a2044933c25d8f8524f0a:/test/stderr/5400 diff --git a/test/stderr/5400 b/test/stderr/5400 index 78b56539a..9fa77d5f2 100644 --- a/test/stderr/5400 +++ b/test/stderr/5400 @@ -12,21 +12,27 @@ 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>> 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 - SMTP>>(nl) +----------- start cutthrough headers send ----------- +added header line(s): +X-hdr-rtr-new: +++ +--- +----------- done cutthrough headers send ------------ SMTP>> . SMTP<< 250 OK LOG: MAIN @@ -53,6 +59,7 @@ check logwrite = rcpt for $local_part@$domain 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 @@ -60,16 +67,21 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected SMTP<< 550 Not here, mate SMTP>> HELO myhost.test.ex SMTP<< 250 OK - SMTP>> MAIL FROM: + 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 - SMTP>>(nl) +----------- start cutthrough headers send ----------- +added header line(s): +X-hdr-rtr-new: +++ +--- +----------- done cutthrough headers send ------------ SMTP>> . SMTP<< 250 OK LOG: MAIN @@ -96,12 +108,13 @@ check logwrite = rcpt for $local_part@$domain 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>> MAIL FROM: SMTP<< 250 Sender OK SMTP>> RCPT TO: SMTP<< 250 Recipient OK @@ -114,6 +127,7 @@ check logwrite = rcpt for $local_part@$domain 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 @@ -125,7 +139,6 @@ Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user admin user -skipping ACL configuration - not needed >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> usery@domain.com <-------- smtp transport entered @@ -139,6 +152,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected SMTP>> EHLO myhost.test.ex SMTP<< 250 OK not using PIPELINING +use_dsn=0 SMTP>> MAIL FROM: SMTP<< 250 Sender OK SMTP>> RCPT TO: @@ -148,6 +162,9 @@ not using PIPELINING 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 @@ -163,3 +180,56 @@ LOG: MAIN 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 >>>>>>>>>>>>>>>>