3 files changed, 5 insertions, 1 deletions
diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index 376bcf6cd..8666b18ff 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -623,7 +623,7 @@ sub get_netaddr {
 
 sub disable_utf8 {
     if (Bugzilla->params->{'utf8'}) {
-        binmode STDOUT, ':raw'; # Turn off UTF8 encoding.
+        binmode STDOUT, ':bytes'; # Turn off UTF8 encoding.
     }
 }
 
diff --git a/chart.cgi b/chart.cgi
index 25d5b446d..ab145c42a 100755
--- a/chart.cgi
+++ b/chart.cgi
@@ -282,6 +282,8 @@ sub plot {
     }
 
     print $cgi->header($format->{'ctype'});
+    disable_utf8() if ($format->{'ctype'} =~ /^image\//);
+
     $template->process($format->{'template'}, $vars)
       || ThrowTemplateError($template->error());
 }
diff --git a/report.cgi b/report.cgi
index c84ed6208..fd2f28943 100755
--- a/report.cgi
+++ b/report.cgi
@@ -328,6 +328,8 @@ if ($cgi->param('debug')) {
 # All formats point to the same section of the documentation.
 $vars->{'doc_section'} = 'reporting.html#reports';
 
+disable_utf8() if ($format->{'ctype'} =~ /^image\//);
+
 $template->process("$format->{'template'}", $vars)
   || ThrowTemplateError($template->error());