summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2018-07-18 22:16:38 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2018-07-18 22:24:40 +0100
commit946515bfe62796f6c0d6554e9e1e227f33253e7c (patch)
tree24fe295a0054cb9974aa3555dc21a9e1fd787a8b /test
parentd629c90c1c83ef1136008a4d6afeed9b6db903fc (diff)
I18N: Fix protocol recorded for a multi-SMTPUTF8-message connection. Bug 2287
Diffstat (limited to 'test')
-rw-r--r--test/log/42013
-rw-r--r--test/scripts/4200-International/420113
-rw-r--r--test/stdout/420115
3 files changed, 30 insertions, 1 deletions
diff --git a/test/log/4201 b/test/log/4201
index 2643dd9ec..6b7c6ac97 100644
--- a/test/log/4201
+++ b/test/log/4201
@@ -6,12 +6,15 @@
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= someone@some.domain H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex
1999-03-02 09:44:33 10HmbA-0005vi-00 <= ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com H=(client) [127.0.0.1] P=utf8esmtp S=sss for usery@test.ex
1999-03-02 09:44:33 10HmaY-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for usery@test.ex
1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <userx@test.ex> R=localuser
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <userx@test.ex> R=localuser
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbB-0005vi-00 => :blackhole: <usery@test.ex> R=localuser
+1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <usery@test.ex> R=localuser
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp -qqff
diff --git a/test/scripts/4200-International/4201 b/test/scripts/4200-International/4201
index 29e51a9db..fc9a50741 100644
--- a/test/scripts/4200-International/4201
+++ b/test/scripts/4200-International/4201
@@ -31,7 +31,7 @@ QUIT
****
#
#
-# utf-8 from, Basic smtp input, no delivery
+# utf-8 from, Basic smtp input, no delivery. Two messages in a connection.
client 127.0.0.1 PORT_D
??? 220
EHLO client
@@ -52,6 +52,17 @@ Subject: test
body
.
??? 250
+MAIL FROM: <ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com> SMTPUTF8
+??? 250
+RCPT TO: <usery@test.ex>
+??? 250
+DATA
+??? 354
+Subject: test
+
+body
+.
+??? 250
QUIT
??? 221
****
diff --git a/test/stdout/4201 b/test/stdout/4201
index 5a110f292..08f6f1145 100644
--- a/test/stdout/4201
+++ b/test/stdout/4201
@@ -64,6 +64,21 @@ Connecting to 127.0.0.1 port 1225 ... connected
>>> .
??? 250
<<< 250 OK id=10HmbA-0005vi-00
+>>> MAIL FROM: <ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com> SMTPUTF8
+??? 250
+<<< 250 OK
+>>> RCPT TO: <usery@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> Subject: test
+>>>
+>>> body
+>>> .
+??? 250
+<<< 250 OK id=10HmbB-0005vi-00
>>> QUIT
??? 221
<<< 221 the.local.host.name closing connection