diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2015-04-21 23:59:07 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2015-04-21 23:59:07 +0100 |
| commit | 0ec7e94825af4ec45b9ab92f9a2d22cf59952600 (patch) | |
| tree | 90858b82ffb23a74a1c157a119264f3b6e68e49e /src | |
| parent | 921dfc1193791b722844341c3ec97be158042c17 (diff) | |
UTF8: mua_wrapper
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/deliver.c | 5 | ||||
| -rw-r--r-- | src/src/exim.c | 3 | ||||
| -rw-r--r-- | src/src/spool_in.c | 2 | ||||
| -rw-r--r-- | src/src/spool_out.c | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/src/src/deliver.c b/src/src/deliver.c index 58b9d3a01..88936b5f9 100644 --- a/src/src/deliver.c +++ b/src/src/deliver.c @@ -5606,8 +5606,11 @@ if (process_recipients != RECIP_IGNORE) { new->prop.utf8_downcvt = message_utf8_downconvert == 1; new->prop.utf8_downcvt_maybe = message_utf8_downconvert == -1; + DEBUG(D_deliver) debug_printf("utf8, downconvert %s\n", + new->prop.utf8_downcvt ? "yes" + : new->prop.utf8_downcvt_maybe ? "ifneeded" + : "no"); } - DEBUG(D_deliver) if (message_smtputf8) debug_printf("utf8\n"); #endif if (r->pno >= 0) diff --git a/src/src/exim.c b/src/src/exim.c index cae296477..e328fb521 100644 --- a/src/src/exim.c +++ b/src/src/exim.c @@ -5088,6 +5088,9 @@ if (mua_wrapper) deliver_drop_privilege = TRUE; queue_smtp = FALSE; queue_smtp_domains = NULL; +#ifdef EXPERIMENTAL_INTERNATIONAL + message_utf8_downconvert = -1; /* convert-if-needed */ +#endif } diff --git a/src/src/spool_in.c b/src/src/spool_in.c index 558d955c1..0780d5894 100644 --- a/src/src/spool_in.c +++ b/src/src/spool_in.c @@ -605,7 +605,7 @@ for (;;) case 'u': if (Ustrncmp(p, "tf8_downcvt", 11) == 0) message_utf8_downconvert = 1; - else if (Ustrncmp(p, "tf8_downcvt_opt", 15) == 0) + else if (Ustrncmp(p, "tf8_optdowncvt", 15) == 0) message_utf8_downconvert = -1; break; #endif diff --git a/src/src/spool_out.c b/src/src/spool_out.c index 48f27a8c6..e8d202033 100644 --- a/src/src/spool_out.c +++ b/src/src/spool_out.c @@ -250,7 +250,7 @@ if (message_smtputf8) { fprintf(f, "-smtputf8\n"); if (message_utf8_downconvert) - fprintf(f, "-utf8_downcvt%s\n", message_utf8_downconvert < 0 ? "_opt" : ""); + fprintf(f, "-utf8_%sdowncvt\n", message_utf8_downconvert < 0 ? "opt" : ""); } #endif |