CHUNKING: handle protocol errors during reception

[exim.git] / test / stderr / 0377

diff --git a/test/stderr/0377 b/test/stderr/0377
index 593542c9214b84986b5f3732c599630cdeedb07b..158a2e161e0939901632e6a913968c728469a662 100644 (file)
--- a/test/stderr/0377
+++ b/test/stderr/0377
@@ -4,8 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept-delivery
-fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -208,7 +206,7 @@ set transport t1
 queued for t1 transport: local_part = cccc
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=cccc
 routed by cccc_accept router
   envelope to: cccc@myhost.test.ex
   transport: t1
@@ -253,7 +251,7 @@ set transport t1
 queued for t1 transport: local_part = bbbb
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=bbbb
 routed by bbbb_0 router
   envelope to: bbbb@myhost.test.ex
   transport: t1
@@ -284,7 +282,7 @@ set transport t1
 queued for t1 transport: local_part = aaaa
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=aaaa
 routed by seen_aaaa router
   envelope to: aaaa@myhost.test.ex
   transport: t1
@@ -301,18 +299,12 @@ After routing:
     defer_bbbb@myhost.test.ex
     defer_cccc@myhost.test.ex
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => aaaa <aaaa@myhost.test.ex> R=seen_aaaa T=t1
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => bbbb <bbbb@myhost.test.ex> R=bbbb_0 T=t1
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => cccc <cccc@myhost.test.ex> R=cccc_accept T=t1
 locking TESTSUITE/spool/db/retry.lockfile
@@ -324,8 +316,6 @@ admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qf
-fresh-exec forking for qrun-delivery
-fresh-exec forked for qrun-delivery: npppp
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: aaaa@myhost.test.ex
@@ -406,7 +396,7 @@ set transport t1
 queued for t1 transport: local_part = bbbb
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=bbbb
 routed by bbbb_0 router
   envelope to: bbbb@myhost.test.ex
   transport: t1
@@ -431,7 +421,7 @@ set transport t1
 queued for t1 transport: local_part = aaaa
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=aaaa
 routed by seen_aaaa router
   envelope to: aaaa@myhost.test.ex
   transport: t1
@@ -543,7 +533,7 @@ set transport t1
 queued for t1 transport: local_part = cccc
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=cccc
 routed by cccc_accept router
   envelope to: cccc@myhost.test.ex
   transport: t1
@@ -571,8 +561,6 @@ admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qf
-fresh-exec forking for qrun-delivery
-fresh-exec forked for qrun-delivery: npppp
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: aaaa@myhost.test.ex
@@ -653,7 +641,7 @@ set transport t1
 queued for t1 transport: local_part = bbbb
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=bbbb
 routed by bbbb_0 router
   envelope to: bbbb@myhost.test.ex
   transport: t1
@@ -678,7 +666,7 @@ set transport t1
 queued for t1 transport: local_part = aaaa
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=aaaa
 routed by seen_aaaa router
   envelope to: aaaa@myhost.test.ex
   transport: t1
@@ -790,7 +778,7 @@ set transport t1
 queued for t1 transport: local_part = cccc
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=cccc
 routed by cccc_accept router
   envelope to: cccc@myhost.test.ex
   transport: t1