Gitweb:
http://git.exim.org/exim.git/commitdiff/b04be5e70485a99e9e6fad2313ffa9f99735767f
Commit: b04be5e70485a99e9e6fad2313ffa9f99735767f
Parent: 9bfc60ebf1f86a212280c19a28bb4399e8fbb392
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Thu Apr 9 21:25:45 2015 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sun Apr 12 23:31:56 2015 +0100
utf8 recipient
---
src/src/exim.c | 3 +++
src/src/utf8.c | 19 +++++++++++++++++++
test/log/4201 | 9 +++++++++
test/scripts/4200-International/4201 | 27 +++++++++++++++++++++++++++
test/stdout/4201 | 12 ++++++++++++
5 files changed, 70 insertions(+), 0 deletions(-)
diff --git a/src/src/exim.c b/src/src/exim.c
index 4248060..cae2964 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -1022,6 +1022,9 @@ DEBUG(D_any) do {
#ifdef SUPPORT_TLS
tls_version_report(f);
#endif
+#ifdef EXPERIMENTAL_INTERNATIONAL
+ utf8_version_report(f);
+#endif
for (authi = auths_available; *authi->driver_name != '\0'; ++authi) {
if (authi->version_report) {
diff --git a/src/src/utf8.c b/src/src/utf8.c
index 32d2eae..611bff0 100644
--- a/src/src/utf8.c
+++ b/src/src/utf8.c
@@ -125,6 +125,25 @@ return res;
}
+/*************************************************
+* Report the library versions. *
+*************************************************/
+
+/* See a description in tls-openssl.c for an explanation of why this exists.
+
+Arguments: a FILE* to print the results to
+Returns: nothing
+*/
+
+void
+utf8_version_report(FILE *f)
+{
+fprintf(f, "Library version: IDN: Compile: %s\n"
+ " Runtime: %s\n",
+ STRINGPREP_VERSION,
+ stringprep_check_version(NULL));
+}
+
#endif /* whole file */
/* vi: aw ai sw=2
diff --git a/test/log/4201 b/test/log/4201
index 6d8260b..467bb6c 100644
--- a/test/log/4201
+++ b/test/log/4201
@@ -42,3 +42,12 @@
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 U=CALLER F=<CALLER@???énopuedensimplementehablarenEspañol.local> rejected RCPT <userS@???>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
1999-03-02 09:44:33 U=CALLER F=<CALLER@???ạisaohọkhôngthểchỉnóitiếngViệt.local> rejected RCPT <userT@???>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
+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 10HmbH-0005vi-00 <= userU@??? U=CALLER P=utf8local-esmtp S=sss for user.γλυκύρριζα@test.ex
+1999-03-02 09:44:33 10HmbI-0005vi-00 <= userU@??? H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmbH-0005vi-00@??? for user.γλυκύρριζα@test.ex
+1999-03-02 09:44:33 10HmbH-0005vi-00 => user.γλυκύρριζα@test.ex F=<userU@???> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbI-0005vi-00"
+1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
+1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
+1999-03-02 09:44:33 10HmbI-0005vi-00 => :blackhole: <user.γλυκύρριζα@test.ex> R=localuser
+1999-03-02 09:44:33 10HmbI-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 a697764..c984f1c 100644
--- a/test/scripts/4200-International/4201
+++ b/test/scripts/4200-International/4201
@@ -161,3 +161,30 @@ QUIT
#
killdaemon
#
+#
+#
+#
+#
+#
+#
+exim -DSERVER=server -bd -oX PORT_D
+****
+#
+# utf-8 to, -bs input and forwarding
+exim -bs -odi
+EHLO client.bh
+MAIL FROM: <userU@???> SMTPUTF8
+RCPT TO: <user.γλυκύρριζα@test.ex>
+DATA
+Subject: test
+
+body
+.
+QUIT
+****
+#
+killdaemon
+exim -DSERVER=server -qqff
+****
+#
+#
diff --git a/test/stdout/4201 b/test/stdout/4201
index 9378243..9cc30f2 100644
--- a/test/stdout/4201
+++ b/test/stdout/4201
@@ -136,3 +136,15 @@ End of script
250 OK
533 mailbox name not allowed
221 the.local.host.name closing connection
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-the.local.host.name Hello CALLER at client.bh
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250-SMTPUTF8
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbH-0005vi-00
+221 the.local.host.name closing connection
