From 8b9476ba56f0fd05ac8303ad86a41e0242bc876d Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 7 Jul 2016 23:20:04 +0100 Subject: Cutthrough: avoid use of callout result cache The connection always needs to be made, and no result need be cached after verify either. --- test/stderr/0376 | 66 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'test/stderr/0376') diff --git a/test/stderr/0376 b/test/stderr/0376 index 310e1a101..664e248e2 100644 --- a/test/stderr/0376 +++ b/test/stderr/0376 @@ -21,9 +21,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO: SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: +wrote callout cache domain record for localhost: result=1 postmaster=0 random=0 -wrote positive callout cache address record +wrote positive callout cache address record for ok@localhost LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -90,9 +90,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO: SMTP<< 550 REJECTED SMTP>> QUIT -wrote callout cache domain record: +wrote callout cache domain record for localhost: result=1 postmaster=0 random=0 -wrote negative callout cache address record +wrote negative callout cache address record for bad@localhost LOG: MAIN REJECT H=[V4NET.0.0.1] U=root sender verify fail for : response to "RCPT TO:" from 127.0.0.1 [127.0.0.1] was: 550 REJECTED LOG: MAIN REJECT @@ -142,7 +142,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> MAIL FROM:<> SMTP<< 550 REJECT MAIL FROM SMTP>> QUIT -wrote callout cache domain record: +wrote callout cache domain record for localhost: result=3 postmaster=0 random=0 LOG: MAIN REJECT H=[V4NET.0.0.1] U=root sender verify fail for : response to "MAIL FROM:<>" from 127.0.0.1 [127.0.0.1] was: 550 REJECT MAIL FROM @@ -201,9 +201,9 @@ Cutthrough cancelled by presence of postmaster verify SMTP>> RCPT TO: SMTP<< 550 NOT OK SMTP>> QUIT -wrote callout cache domain record: +wrote callout cache domain record for otherhost: result=1 postmaster=2 random=0 -wrote positive callout cache address record +wrote positive callout cache address record for ok@otherhost LOG: MAIN REJECT H=[V4NET.0.0.2] U=root sender verify fail for : response to "RCPT TO:" from 127.0.0.1 [127.0.0.1] was: 550 NOT OK LOG: MAIN REJECT @@ -261,9 +261,9 @@ Cutthrough cancelled by presence of postmaster verify SMTP>> RCPT TO: SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: +wrote callout cache domain record for otherhost2: result=1 postmaster=1 random=0 -wrote positive callout cache address record +wrote positive callout cache address record for ok@otherhost2 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -308,7 +308,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO: SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: +wrote callout cache domain record for otherhost3: result=1 postmaster=0 random=1 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT @@ -352,7 +352,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO: SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: +wrote callout cache domain record for otherhost4: result=1 postmaster=0 random=1 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT @@ -409,9 +409,9 @@ Cutthrough cancelled by presence of postmaster verify SMTP>> RCPT TO: SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: +wrote callout cache domain record for otherhost41: result=1 postmaster=1 random=2 -wrote positive callout cache address record +wrote positive callout cache address record for ok@otherhost41 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -464,9 +464,9 @@ Cutthrough cancelled by presence of postmaster verify SMTP>> RCPT TO: SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: +wrote callout cache domain record for otherhost21: result=1 postmaster=1 random=0 -wrote positive callout cache address record +wrote positive callout cache address record for ok@otherhost21 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -494,9 +494,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO: SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: +wrote callout cache domain record for otherhost21: result=1 postmaster=1 random=0 -wrote positive callout cache address record +wrote positive callout cache address record for ok2@otherhost21 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -529,9 +529,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO: SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: +wrote callout cache domain record for otherhost31: result=1 postmaster=0 random=2 -wrote positive callout cache address record +wrote positive callout cache address record for ok@otherhost31 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -559,9 +559,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO: SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: +wrote callout cache domain record for otherhost31: result=1 postmaster=0 random=2 -wrote positive callout cache address record +wrote positive callout cache address record for okok@otherhost31 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -594,9 +594,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO: SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: +wrote callout cache domain record for otherhost31: result=1 postmaster=0 random=2 -wrote positive callout cache address record +wrote positive callout cache address record for okokok@otherhost31 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -622,7 +622,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP>> RCPT TO: SMTP timeout -wrote callout cache domain record: +wrote callout cache domain record for otherhost51: result=1 postmaster=0 random=0 LOG: MAIN REJECT H=[V4NET.0.0.5] U=root sender verify defer for : Could not complete sender verify callout @@ -661,9 +661,9 @@ Cutthrough cancelled by presence of postmaster verify SMTP>> RCPT TO: SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: +wrote callout cache domain record for otherhost52: result=1 postmaster=1 random=0 -wrote positive callout cache address record +wrote positive callout cache address record for okokok@otherhost52 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -691,9 +691,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO: SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: +wrote callout cache domain record for x.y.z: result=1 postmaster=0 random=0 -wrote positive callout cache address record +wrote positive callout cache address record for abcd@x.y.z/ LOG: MAIN <= ok7@otherhost53 H=[V4NET.0.0.7] U=root P=smtp S=sss LOG: smtp_connection MAIN @@ -722,7 +722,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP>> RCPT TO: SMTP timeout -wrote callout cache domain record: +wrote callout cache domain record for x.y.z: result=1 postmaster=0 random=0 LOG: MAIN <= ok7@otherhost53 H=[V4NET.0.0.8] U=root P=smtp S=sss @@ -761,9 +761,9 @@ Cutthrough cancelled by presence of postmaster verify SMTP>> RCPT TO: SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: +wrote callout cache domain record for otherhost9: result=1 postmaster=1 random=0 -wrote positive callout cache address record +wrote positive callout cache address record for ok@otherhost9 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -803,9 +803,9 @@ Cutthrough cancelled by presence of postmaster verify SMTP>> RCPT TO: SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: +wrote callout cache domain record for test.ex: result=1 postmaster=1 random=2 -wrote positive callout cache address record +wrote positive callout cache address record for z@test.ex/ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> -- cgit v1.2.3