Bug 376911: Non-text content-types require setting the charset manually in the $cgi...

diff --git a/duplicates.cgi b/duplicates.cgi
index 94b35df9794e5046bad27421a3ca5576dc182406..e393d7c257136fefc7c9d1861042ace25c590bbb 100755 (executable)
--- a/duplicates.cgi
+++ b/duplicates.cgi
@@ -266,7 +266,13 @@ my $format = $template->get_format("reports/duplicates",
                                    scalar($cgi->param('format')),
                                    scalar($cgi->param('ctype')));
 
-print $cgi->header($format->{'ctype'});
+# We set the charset in Bugzilla::CGI, but CGI.pm ignores it unless the
+# Content-Type is a text type. In some cases, such as when we are
+# generating RDF, it isn't, so we specify the charset again here.
+print $cgi->header(
+    -type => $format->{'ctype'},
+    (Bugzilla->params->{'utf8'} ? ('charset', 'utf8') : () )
+);
 
 # Generate and return the UI (HTML page) from the appropriate template.
 $template->process($format->{'template'}, $vars)