From: don <>
Date: Wed, 26 Oct 2005 08:54:57 +0000 (-0800)
Subject: [project @ 2005-10-26 01:54:56 by don]
X-Git-Tag: release/2.6.0~633
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=97f986ff867e2ba978ff76446b926b5fea54e924;p=debbugs.git

[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 9dd10e0..b1196ba 100755
--- 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 2d1b636..dbd791a 100644
--- 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