Merge branch 'master' into 4.next

[exim.git] / test / confs / 0610

diff --git a/test/confs/0610 b/test/confs/0610
index 5ce2723aeee6f2f083533362c63b3d76217b3e28..370391b9579ead0731809ce53e48785de416ead4 100644 (file)
--- a/test/confs/0610
+++ b/test/confs/0610
@@ -21,7 +21,9 @@ queue_run_in_order
 begin acl
 
 conn_chk:
 begin acl
 
 conn_chk:

+.ifdef DELAY

   defer        condition = ${if eq {SERVER}{server}}
   defer        condition = ${if eq {SERVER}{server}}

+.endif

   accept
 
 # ----- Routers -----
   accept
 
 # ----- Routers -----


@@ -62,7 +64,7 @@ t2:
 
 begin retry
 
 
 begin retry
 

-* * F,5d,10s
+* * F,5d,1s

 
 # End
 
 
 # End