TLS: fix resumption for TLS-on-connect

[exim.git] / test / stderr / 0143

diff --git a/test/stderr/0143 b/test/stderr/0143
index f8c9624ce89d18affb644e35e90a3b587ccc8a56..c6ff94fe75aa131731494dd5e46faba8a365b150 100644 (file)
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -12,15 +12,15 @@ dropping to exim gid; retaining priv uid
 router_name <my_main_router>
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> userx@domain.com <--------
 router_name <my_main_router>
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> userx@domain.com <--------

-transport_name <my_smtp>
+transport_name <my_smtp> from router <my_main_router>

 my_smtp transport entered
   userx@domain.com
 hostlist:
   '127.0.0.1' IP 127.0.0.1 port -1
 my_smtp transport entered
   userx@domain.com
 hostlist:
   '127.0.0.1' IP 127.0.0.1 port -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/ip4.ip4.ip4.ip4 retry-status = usable
 127.0.0.1 [127.0.0.1]:1111/ip4.ip4.ip4.ip4 retry-status = usable

-delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@domain.com)
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ...  connected
+delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@domain.com)
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S from ip4.ip4.ip4.ip4 ...  connected

   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes


@@ -61,5 +61,5 @@ LOG: MAIN
   => userx@domain.com R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed
   => userx@domain.com R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>