From 7019e10b7ab291e67b3499623547ea755098f972 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 11 Apr 2015 18:08:18 +0100 Subject: [PATCH] DNS lookups never use UTF-8 --- doc/doc-txt/experimental-spec.txt | 3 ++- test/dnszones-src/db.test.ex | 8 ++++---- test/stdout/0405 | 5 +++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/doc/doc-txt/experimental-spec.txt b/doc/doc-txt/experimental-spec.txt index 79b21fe39..3dbf13f9d 100644 --- a/doc/doc-txt/experimental-spec.txt +++ b/doc/doc-txt/experimental-spec.txt @@ -1288,7 +1288,8 @@ international handling for the message is enabled and the expansion variable $message_smtputf8 will have value TRUE. The option allow_utf8_domains is set to true for this -message, but all DNS lookups are converted to a-label form. +message. All DNS lookups are converted to a-label form +whatever the setting of allow_utf8_domains. Log lines and Received-by: header lines will aquire a "utf8" prefix on the protocol element, eg. utf8esmtp. diff --git a/test/dnszones-src/db.test.ex b/test/dnszones-src/db.test.ex index fec2a0d78..ebf9a4021 100644 --- a/test/dnszones-src/db.test.ex +++ b/test/dnszones-src/db.test.ex @@ -38,9 +38,9 @@ dontqualify A V4NET.255.255.254 UpperCase A 127.0.0.1 -; A host with UTF-8 characters in its name +; A host with UTF-8 characters used for its lookup ( π.test.ex ) -mx.π A V4NET.255.255.255 +mx.xn--1xa A V4NET.255.255.255 ; A non-standard name for localhost @@ -358,9 +358,9 @@ mxt97 MX 1 ten-1.test.ex. mxt1c MX 1 dontqualify. -; MX with UTF-8 characters in its name +; MX with UTF-8 characters used for its lookup ( π.test.ex ) -π MX 0 mx.π.test.ex. +xn--1xa MX 0 mx.xn--1xa.test.ex. ; -------- Testing SRV records -------- diff --git a/test/stdout/0405 b/test/stdout/0405 index 6b561f74f..f5b5dce41 100644 --- a/test/stdout/0405 +++ b/test/stdout/0405 @@ -1,4 +1,5 @@ syntax error: domain missing or malformed -bounce@π.test.ex +bounce@xn--1xa.test.ex + <-- bounce@π.test.ex router = r1, transport = t1 - host mx.π.test.ex [V4NET.255.255.255] MX=0 + host mx.xn--1xa.test.ex [V4NET.255.255.255] MX=0 -- 2.25.1