svn commit: r1900225 - in /spamassassin/trunk: lib/Mail/SpamAssassin/Util.pm t/uri.t

[he...@apache.org]

Author: hege
Date: Sat Apr 23 17:17:49 2022
New Revision: 1900225

URL: http://svn.apache.org/viewvc?rev=1900225&view=rev
Log:
utf8 tweak

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
    spamassassin/trunk/t/uri.t

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm?rev=1900225&r1=1900224&r2=1900225&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Sat Apr 23 17:17:49 2022
@@ -544,8 +544,8 @@ sub idn_to_ascii {
       my $si = $s;
       if ($charset eq 'ISO-8859-1') {
         Encode::from_to($si, 'ISO-8859-1', 'UTF-8');
-        utf8::decode($si) unless utf8::is_utf8($si);
       }
+      utf8::decode($si) unless utf8::is_utf8($si);
       my $rc = 0;
       my $sa = Net::LibIDN2::idn2_to_ascii_8($si,
                  &Net::LibIDN2::IDN2_NFC_INPUT + &Net::LibIDN2::IDN2_NONTRANSITIONAL,

Modified: spamassassin/trunk/t/uri.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/uri.t?rev=1900225&r1=1900224&r2=1900225&view=diff
==============================================================================
--- spamassassin/trunk/t/uri.t (original)
+++ spamassassin/trunk/t/uri.t Sat Apr 23 17:17:49 2022
@@ -9,8 +9,8 @@ use constant HAS_LIBIDN => eval { requir
 use constant HAS_LIBIDN2 => eval { require Net::LibIDN2; };
 
 my $tests = 104;
-$tests += 6 if (HAS_LIBIDN);
-$tests += 6 if (HAS_LIBIDN2);
+$tests += 7 if (HAS_LIBIDN);
+$tests += 7 if (HAS_LIBIDN2);
 
 plan tests => $tests;
 
@@ -110,7 +110,8 @@ ok(try_domains('http://example..com', un
 sub try_libidn {
   ok(try_domains("Cin\x{E9}ma.ca", 'xn--cinma-dsa.ca'));
   ok(try_domains("marcaespa\x{F1}a.es", 'xn--marcaespaa-19a.es'));
-  ok(try_domains("\xe4k\xe4slompolo.fi", 'xn--kslompolo-u2ab.fi'));
+  ok(try_domains("\x{E4}k\x{E4}slompolo.fi", 'xn--kslompolo-u2ab.fi'));
+  ok(try_domains("\N{U+00E4}k\N{U+00E4}slompolo.fi", 'xn--kslompolo-u2ab.fi'));
   ok(try_domains("\x{C3}\x{A4}k\x{C3}\x{A4}slompolo.fi", 'xn--kslompolo-u2ab.fi'));
   ok(try_domains("foo.xn--fiqs8s", 'foo.xn--fiqs8s'));
   ok(try_domains("foo\x2e\xe9\xa6\x99\xe6\xb8\xaf", 'foo.xn--j6w193g'));