summaryrefslogtreecommitdiff
path: root/test/stdout/4015
diff options
context:
space:
mode:
authorHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2016-11-25 11:23:26 +0100
committerHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2016-11-25 11:25:08 +0100
commit4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 (patch)
tree3f1ff4523e24671e5992008e6ac2d9f299942cfa /test/stdout/4015
parent7a28511635d0d5f385a7c389bc5ec95dfed95581 (diff)
Merge from master into 4.next
Done with git merge --squash -x theirs master
Diffstat (limited to 'test/stdout/4015')
-rw-r--r--test/stdout/401512
1 files changed, 6 insertions, 6 deletions
diff --git a/test/stdout/4015 b/test/stdout/4015
index a1d7f2ea7..7e1d83e89 100644
--- a/test/stdout/4015
+++ b/test/stdout/4015
@@ -1,5 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250-myhost.test.ex Hello CALLER at test.ex
+250-myhost.test.ex Hello fromuser at test.ex
250-SIZE 52428800
250-8BITMIME
250-PIPELINING
@@ -15,19 +15,19 @@ Listening on port 7833 ...
Connection request from [127.0.0.1]
<REPORT SPAMC/1.2
<User: nobody
-<Content-length: 479
+<Content-length: 465
<
<From MAILER-DAEMON Tue Mar 02 09:44:33 1999
-<X-Envelope-From: <CALLER@myhost.test.ex>
+<X-Envelope-From: <fromuser@myhost.test.ex>
<X-Envelope-To: userx@test.ex
-<Received: from CALLER (helo=test.ex)
+<Received: from fromuser (helo=test.ex)
< by myhost.test.ex with local-esmtp (Exim x.yz)
-< (envelope-from <CALLER@myhost.test.ex>)
+< (envelope-from <fromuser@myhost.test.ex>)
< id 10HmaX-0005vi-00
< for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
<Content-type: text/plain
<Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
-<From: CALLER_NAME <CALLER@myhost.test.ex>
+<From: fromuser@myhost.test.ex
<Date: Tue, 2 Mar 1999 09:44:33 +0000
<
<test