From d38d00a4acf07d8ba73505ef5a03741867a0362e Mon Sep 17 00:00:00 2001
From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Sun, 28 Mar 2010 14:05:18 -0700
Subject: Bug 365926: Serve attachments without an explicit charset, and let
 the browser decide which charset to use r=LpSolit, a=LpSolit

---
 attachment.cgi | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/attachment.cgi b/attachment.cgi
index 0181f8cad..f85fb3a19 100755
--- a/attachment.cgi
+++ b/attachment.cgi
@@ -329,6 +329,14 @@ sub view {
 
     my $disposition = Bugzilla->params->{'allow_attachment_display'} ? 'inline' : 'attachment';
 
+    # Don't send a charset header with attachments--they might not be UTF-8.
+    # However, we do allow people to explicitly specify a charset if they
+    # want.
+    if ($contenttype !~ /\bcharset=/i) {
+        # In order to prevent Apache from adding a charset, we have to send a
+        # charset that's a single space.
+        $cgi->charset(' ');
+    }
     print $cgi->header(-type=>"$contenttype; name=\"$filename\"",
                        -content_disposition=> "$disposition; filename=\"$filename\"",
                        -content_length => $attachment->datasize);
-- 
cgit v1.2.3-24-g4f1b