[project @ 2005-10-26 01:54:56 by don]

* Output proper charset for attachments (closes: #335813)

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 9dd10e0cfb580e8b81fc771186a615f73f5195d2..b1196baf94304e1eb1ad11c0c5f7bf4d4fcbbc59 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -109,7 +109,10 @@ sub display_entity ($$$$\$\@) {
            my $head = $entity->head;
            chomp(my $type = $entity->effective_type);
            my $body = $entity->stringify_body;
-           print "Content-Type: $type\n";
+           print "Content-Type: $type";
+           my ($charset) = $head->get('Content-Type:') =~ m/charset\s*=\s*\"?([\w-]+)\"?/i;
+           print qq(; charset="$charset") if defined $charset;
+           print "\n";
            if ($filename ne '') {
                my $qf = $filename;
                $qf =~ s/"/\\"/g;

diff --git a/debian/changelog b/debian/changelog
index 2d1b63669c75e79953f9132eb08cdbd2797a6589..dbd791a50efb2cc7a4089752c70fe108cfe678e3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -96,6 +96,7 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Allow forwarded: to be set at submit@ time. (closes: #128320)
     - Fix example rewrite rules to allow for #1234 and foo+bar@baz.com
     (closes: #321925)
+    - Output proper charset for attachments (closes: #335813)
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100