Testsuite: explicitly disable TFO in transports

[users/jgh/exim.git] / test / stderr / 2135

diff --git a/test/stderr/2135 b/test/stderr/2135
index 5a4de14ec315bf3e46f8af83ae2fa189a7be3bd1..4359c4ab265657eef7c4713ac064745bed47a0a6 100644 (file)
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -4,7 +4,7 @@ admin user
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 Transport port=25 replaced by host-specific port=1225
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 Transport port=25 replaced by host-specific port=1225

-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  connected

   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes


@@ -26,26 +26,31 @@ cmd buf flush ddd bytes
          250 HELP
 using PIPELINING
 not using DSN
          250 HELP
 using PIPELINING
 not using DSN

-  SMTP>> MAIL FROM:<usera@ok.example> SIZE=ssss
+  SMTP>> MAIL FROM:<usera@ok.example>

   SMTP>> RCPT TO:<userb@test.ex>
 cmd buf flush ddd bytes
   SMTP>> RCPT TO:<userb@test.ex>
 cmd buf flush ddd bytes

+sync_responses expect mail

   SMTP<< 250 OK
   SMTP<< 250 OK

+sync_responses expect rcpt

   SMTP<< 250 Accepted
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
   SMTP<< 250 Accepted
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+proxy-proc inter-pid pppp
+proxy-proc final-pid pppp

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

+dropping to exim gid; retaining priv uid

 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> userb@test.ex <--------
 t1 transport entered
   userb@test.ex
 hostlist:
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> userb@test.ex <--------
 t1 transport entered
   userb@test.ex
 hostlist:

-  127.0.0.1:1225
+  '127.0.0.1' IP 127.0.0.1 port 1225

 already connected to 127.0.0.1 [127.0.0.1] (on fd 0)
 checking status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 already connected to 127.0.0.1 [127.0.0.1] (on fd 0)
 checking status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable


@@ -54,6 +59,7 @@ Transport port=25 replaced by host-specific port=1225
 continued connection, proxied TLS
   SMTP>> DATA
 cmd buf flush ddd bytes
 continued connection, proxied TLS
   SMTP>> DATA
 cmd buf flush ddd bytes

+sync_responses expect data

   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP>> writing message and terminating "."
 cannot use sendfile for body: spoolfile not wireformat
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP>> writing message and terminating "."
 cannot use sendfile for body: spoolfile not wireformat


@@ -63,12 +69,12 @@ ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP(close)>>
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP(close)>>

+>>>>>>>>>>>>>>>> Exim pid=pppp (TLS proxy) terminating with rc=0 >>>>>>>>>>>>>>>>

 Leaving t1 transport
 Leaving t1 transport

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: MAIN
 LOG: MAIN

-  => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmaY-0005vi-00"
+  => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-0005vi-00"

 LOG: MAIN
   Completed
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>

 
 ******** SERVER ********
 
 ******** SERVER ********