Log queue_time and queue_time_overall exclusive of receive time. Bug 2672

[exim.git] / test / stdout / 0035

diff --git a/test/stdout/0035 b/test/stdout/0035
index dfc44ed51abf584ab70f658e4003158f81974041..94b08fcd6156617f0b57f81ee9464c8561de4ad5 100644 (file)
--- a/test/stdout/0035
+++ b/test/stdout/0035
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250
 <<< 250 HELP
@@ -85,6 +87,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250
 <<< 250 HELP
@@ -114,6 +118,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250
 <<< 250 HELP
@@ -135,14 +141,17 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 221 myhost.test.ex closing connection
 End of script
 10HmaX-0005vi-00-H
-CALLER UID GID
+EXIMUSER EXIM_UID EXIM_GID
 <notsubmit@y>
 ddddddddd 0
--helo_name rhu.barb
+-received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
+--helo_name rhu.barb
 -host_address 127.0.0.1.9999
 -interface_address 127.0.0.1.1225
 -received_protocol esmtp
 -body_linecount 0
+-max_received_linelength 0
 -deliver_firsttime
 XX
 1
@@ -154,14 +163,17 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
 10HmaY-0005vi-00-H
-CALLER UID GID
+EXIMUSER EXIM_UID EXIM_GID
 <a@y>
 ddddddddd 0
--helo_name rhu.barb
+-received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
+--helo_name rhu.barb
 -host_address 127.0.0.1.9999
 -interface_address 127.0.0.1.1225
 -received_protocol esmtp
 -body_linecount 0
+-max_received_linelength 0
 -deliver_firsttime
 XX
 1
@@ -176,14 +188,17 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
 dddF From: a@y
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 10HmaZ-0005vi-00-H
-CALLER UID GID
+EXIMUSER EXIM_UID EXIM_GID
 <>
 ddddddddd 0
--helo_name rhu.barb
+-received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
+--helo_name rhu.barb
 -host_address 127.0.0.1.9999
 -interface_address 127.0.0.1.1225
 -received_protocol esmtp
 -body_linecount 0
+-max_received_linelength 0
 -deliver_firsttime
 XX
 1
@@ -196,14 +211,17 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
 047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 10HmbA-0005vi-00-H
-CALLER UID GID
+EXIMUSER EXIM_UID EXIM_GID
 <notsubmit@y>
 ddddddddd 0
--helo_name rhu.barb
+-received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
+--helo_name rhu.barb
 -host_address 127.0.0.1.9999
 -interface_address 127.0.0.1.1225
 -received_protocol esmtp
 -body_linecount 0
+-max_received_linelength 25
 -deliver_firsttime
 XX
 1
@@ -216,14 +234,17 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
 dddS Sender: sender@some.where
 10HmbB-0005vi-00-H
-CALLER UID GID
+EXIMUSER EXIM_UID EXIM_GID
 <a@y>
 ddddddddd 0
--helo_name rhu.barb
+-received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
+--helo_name rhu.barb
 -host_address 127.0.0.1.9999
 -interface_address 127.0.0.1.1225
 -received_protocol esmtp
 -body_linecount 0
+-max_received_linelength 25
 -deliver_firsttime
 XX
 1
@@ -239,14 +260,17 @@ ddd* Sender: sender@some.where
 dddF From: a@y
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 10HmbC-0005vi-00-H
-CALLER UID GID
+EXIMUSER EXIM_UID EXIM_GID
 <a@y>
 ddddddddd 0
--helo_name rhu.barb
+-received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
+--helo_name rhu.barb
 -host_address 127.0.0.1.9999
 -interface_address 127.0.0.1.1225
 -received_protocol esmtp
 -body_linecount 0
+-max_received_linelength 25
 -deliver_firsttime
 XX
 1
@@ -262,14 +286,17 @@ dddS Sender: sender@some.where
 dddF From: a@y
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 10HmbD-0005vi-00-H
-CALLER UID GID
+EXIMUSER EXIM_UID EXIM_GID
 <a@y>
 ddddddddd 0
--helo_name rhu.barb
+-received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
+--helo_name rhu.barb
 -host_address 127.0.0.1.9999
 -interface_address 127.0.0.1.1225
 -received_protocol esmtp
 -body_linecount 0
+-max_received_linelength 25
 -deliver_firsttime
 XX
 1