summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kanat-Alexander <mkanat@bugzilla.org>2010-03-28 23:05:18 +0200
committerMax Kanat-Alexander <mkanat@bugzilla.org>2010-03-28 23:05:18 +0200
commitd38d00a4acf07d8ba73505ef5a03741867a0362e (patch)
tree7b32e71037082270db2fbbaa85b5630743325aec
parentb2fb326bf732619d3aea81190199af33e4790736 (diff)
downloadbugzilla-d38d00a4acf07d8ba73505ef5a03741867a0362e.tar.gz
bugzilla-d38d00a4acf07d8ba73505ef5a03741867a0362e.tar.xz
Bug 365926: Serve attachments without an explicit charset, and let the browser
decide which charset to use r=LpSolit, a=LpSolit
-rwxr-xr-xattachment.cgi8
1 files changed, 8 insertions, 0 deletions
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);