From: lpsolit%gmail.com <>
Date: Sat, 26 Jan 2008 16:41:13 +0000 (+0000)
Subject: Bug 413672: email_in.pl incorrectly rejects quoted charsets - Patch by Frédéric... 
X-Git-Tag: bugzilla-3.1.3~359
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e29f04a94902958827585b02591094de67dd36a;p=thirdparty%2Fbugzilla.git

Bug 413672: email_in.pl incorrectly rejects quoted charsets - Patch by Frédéric Buclin <LpSolit@gmail.com> r/a=mkanat
---

diff --git a/email_in.pl b/email_in.pl
index 02d00a3e21..ca7a297350 100644
--- a/email_in.pl
+++ b/email_in.pl
@@ -294,7 +294,8 @@ sub get_text_alternative {
     foreach my $part (@parts) {
         my $ct = $part->content_type || 'text/plain';
         my $charset = 'iso-8859-1';
-        if ($ct =~ /charset=([^;]+)/) {
+        # The charset may be quoted.
+        if ($ct =~ /charset="?([^;"]+)/) {
             $charset= $1;
         }
         debug_print("Part Content-Type: $ct", 2);