CHUNKING: fix transport crash on temp-reject of pipelined non-first chunk

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

diff --git a/test/stderr/5420 b/test/stderr/5420
index eb3f1a9d2c3288fac1a57a196ea19bffde0e2394..a4f64f2d1317e7df4f325d67de5c2ec218cf1129 100644 (file)
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -119,10 +119,9 @@ using PIPELINING
 not using DSN
 127.0.0.1 in hosts_require_auth? no (option unset)
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
-cmd buf flush ddd bytes
-  SMTP<< 250 OK
   SMTP>> RCPT TO:<userx@domain.com>
 cmd buf flush ddd bytes
+  SMTP<< 250 OK
   SMTP<< 250 Accepted
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
@@ -131,6 +130,8 @@ accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
   SMTP>> DATA
   SMTP<< 354 Enter message, ending with "." on a line by itself
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
 considering: ${tod_full}
   expanding: ${tod_full}
      result: Tue, 2 Mar 1999 09:44:33 +0000
@@ -227,6 +228,7 @@ considering:
        for userx@domain.com
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
+PDKIM >> raw hdr: QUIT{CR}{LF}
 considering: ${tod_full}
   expanding: ${tod_full}
      result: Tue, 2 Mar 1999 09:44:33 +0000
@@ -334,10 +336,9 @@ using PIPELINING
 not using DSN
 127.0.0.1 in hosts_require_auth? no (option unset)
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
-cmd buf flush ddd bytes
-  SMTP<< 250 OK
   SMTP>> RCPT TO:<usery@domain.com>
 cmd buf flush ddd bytes
+  SMTP<< 250 OK
   SMTP<< 250 Accepted
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
@@ -346,6 +347,8 @@ accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
   SMTP>> DATA
   SMTP<< 354 Enter message, ending with "." on a line by itself
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
 considering: ${tod_full}
   expanding: ${tod_full}
      result: Tue, 2 Mar 1999 09:44:33 +0000
@@ -442,6 +445,7 @@ considering:
        for usery@domain.com
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
+PDKIM >> raw hdr: QUIT{CR}{LF}
 considering: ${tod_full}
   expanding: ${tod_full}
      result: Tue, 2 Mar 1999 09:44:33 +0000
@@ -549,10 +553,9 @@ using PIPELINING
 not using DSN
 127.0.0.1 in hosts_require_auth? no (option unset)
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
-cmd buf flush ddd bytes
-  SMTP<< 250 OK
   SMTP>> RCPT TO:<usery@domain.com>
 cmd buf flush ddd bytes
+  SMTP<< 250 OK
   SMTP<< 250 Accepted
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
@@ -561,6 +564,8 @@ accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
   SMTP>> DATA
   SMTP<< 354 Enter message, ending with "." on a line by itself
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
 considering: ${tod_full}
   expanding: ${tod_full}
      result: Tue, 2 Mar 1999 09:44:33 +0000
@@ -657,6 +662,7 @@ considering:
        for usery@domain.com
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
+PDKIM >> raw hdr: QUIT{CR}{LF}
 considering: ${tod_full}
   expanding: ${tod_full}
      result: Tue, 2 Mar 1999 09:44:33 +0000