Cutthrough: option to use transport-defined mailfrom. Bug 3071

[exim.git] / test / stderr / 0379

diff --git a/test/stderr/0379 b/test/stderr/0379
index b67f47861cc811a2024611151654aed2a0b6ba38..c42ed221c13106a6a3315df48ece27ce842dd715 100644 (file)
--- a/test/stderr/0379
+++ b/test/stderr/0379
@@ -44,8 +44,8 @@ aaaa_redirect router generated bbbb@myhost.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by aaaa_redirect router
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by aaaa_redirect router

-  envelope to: aaaa@myhost.test.ex
-  transport: <none>
+  envelope to: aaaa@myhost.test.ex
+  transport:   <none>

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing defer@myhost.test.ex
 --------> defer router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing defer@myhost.test.ex
 --------> defer router <--------


@@ -94,8 +94,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=cccc
 routed by bc router
   errors_to=NULL
   domain_data=NULL local_part_data=cccc
 routed by bc router

-  envelope to: cccc@myhost.test.ex
-  transport: t1
+  envelope to: cccc@myhost.test.ex
+  transport:   t1

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing bbbb@myhost.test.ex
 --------> defer router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing bbbb@myhost.test.ex
 --------> defer router <--------


@@ -119,8 +119,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=bbbb
 routed by bc router
   errors_to=NULL
   domain_data=NULL local_part_data=bbbb
 routed by bc router

-  envelope to: bbbb@myhost.test.ex
-  transport: t1
+  envelope to: bbbb@myhost.test.ex
+  transport:   t1

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:


@@ -130,8 +130,10 @@ After routing:
   Failed addresses:
   Deferred addresses:
     defer@myhost.test.ex
   Failed addresses:
   Deferred addresses:
     defer@myhost.test.ex

+>>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: MAIN
   => bbbb <aaaa@myhost.test.ex> R=bc T=t1
 LOG: MAIN
   => bbbb <aaaa@myhost.test.ex> R=bc T=t1

+>>>>>>>>>>>>>>>> Exim pid=p1238 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: MAIN
   => cccc <aaaa@myhost.test.ex> R=bc T=t1
 >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => cccc <aaaa@myhost.test.ex> R=bc T=t1
 >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -169,7 +171,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
     defer@myhost.test.ex
   Failed addresses:
   Deferred addresses:
     defer@myhost.test.ex

->>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: queue_run MAIN
   End queue run: pid=p1234 -qf
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
   End queue run: pid=p1234 -qf
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>