diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-02-24 20:04:25 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-02-24 20:42:31 +0000 |
| commit | e6532c4a78619d4ea45b6e95b738189eebf8859a (patch) | |
| tree | 4dc3a6cea40cf8650131ff4a94b9a0f76fcfa0ae /src | |
| parent | 2009ecca3f3413925537ed5563a1409f74bcd194 (diff) | |
I18N: Fix utf8_downconvert propagation through a redirect router
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/routers/redirect.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/src/routers/redirect.c b/src/src/routers/redirect.c index b69ba535f..944fb6743 100644 --- a/src/src/routers/redirect.c +++ b/src/src/routers/redirect.c @@ -465,8 +465,9 @@ while (generated) } #ifdef SUPPORT_I18N - next->prop.utf8_msg = string_is_utf8(next->address) - || (sender_address && string_is_utf8(sender_address)); + if (!next->prop.utf8_msg) + next->prop.utf8_msg = string_is_utf8(next->address) + || (sender_address && string_is_utf8(sender_address)); #endif DEBUG(D_route) @@ -567,9 +568,9 @@ addr_prop.remove_headers = NULL; addr_prop.srs_sender = NULL; #endif #ifdef SUPPORT_I18N -addr_prop.utf8_msg = FALSE; /*XXX should we not copy this from the parent? */ -addr_prop.utf8_downcvt = FALSE; -addr_prop.utf8_downcvt_maybe = FALSE; +addr_prop.utf8_msg = addr->prop.utf8_msg; +addr_prop.utf8_downcvt = addr->prop.utf8_downcvt; +addr_prop.utf8_downcvt_maybe = addr->prop.utf8_downcvt_maybe; #endif |