Cutthrough: handle request when a callout-hold is active. Bug 2604

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

diff --git a/test/stderr/2135 b/test/stderr/2135
index a818a453179f47064a5776cde2a73a4ac9a41a57..70759060ff813b6a7a4be245fb3ee6b9a0e800eb 100644 (file)
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -35,18 +35,9 @@ sync_responses expect rcpt
   SMTP<< 250 Accepted
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
-fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
-fresh-exec forked for local-accept-delivery: npppp
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
-local-accept-delivery forking for tls-proxy-interproc
-postfork: tls-proxy-interproc
-tls-proxy-interproc forking for tls-proxy
-postfork: tls-proxy
-local-accept-delivery forked for tls-proxy-interproc: npppp
-tls-proxy-interproc forked for tls-proxy: npppp
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -54,8 +45,6 @@ admin user
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> userb@test.ex <--------
-local-accept-delivery forking for transport
-postfork: transport
 t1 transport entered
   userb@test.ex
 hostlist:
@@ -78,13 +67,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)>>
-local-accept-delivery forked for transport: npppp
->>>>>>>>>>>>>>>> Exim pid=pppp (TLS proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
 Leaving t1 transport
 LOG: MAIN
   => 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
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 
 ******** SERVER ********