Merge pull request #1803 from ikedas/issue-1802 by ikedas

WWSympa: Uploaded file names in UTF-8 were garbled (#1802)

cpanfile

@@ -195,7 +195,7 @@ recommends 'Net::SMTP';
 # Note: Perl 5.10.1 bundles 1.03 (per Unicode 5.1.0).
 recommends 'Unicode::Normalize', '>= 1.03';
 
-recommends 'Unicode::UTF8', '>= 0.58';
+recommends 'Unicode::UTF8', '>= 0.60';
 
 ### Features
 ##
@@ -327,7 +327,7 @@ feature 'safe-unicode', 'Sanitizes inputs with Unicode text.' => sub {
     # Note: Perl 5.8.1 bundles version 0.23.
     # Note: Perl 5.10.1 bundles 1.03 (per Unicode 5.1.0).
     requires 'Unicode::Normalize', '>= 1.03';
-    requires 'Unicode::UTF8', '>= 0.58';
+    requires 'Unicode::UTF8', '>= 0.60';
 };
 
 on 'test' => sub {

src/lib/Sympa/Tools/Text.pm

@@ -315,8 +315,10 @@ sub guessed_to_utf8 {
 
     my $utf8;
     if ($Unicode::UTF8::VERSION) {
-        $utf8 =
-            eval { Unicode::UTF8::decode_utf8($text, Encode::FB_CROAK()) };
+        $utf8 = Unicode::UTF8::decode_utf8($text)
+            if Unicode::UTF8::valid_utf8($text);
+    } else {
+        $utf8 = eval { Encode::decode_utf8($text, Encode::FB_CROAK()) };
     }
     unless (defined $utf8) {
         foreach my $charset (map { $_ ? @$_ : () } @legacy_charsets{@langs}) {