From 8100ea2228ab8a9836968c5def84b0cb6d473688 Mon Sep 17 00:00:00 2001
From: "justdave%bugzilla.org" <>
Date: Sat, 23 Oct 2004 16:04:16 +0000
Subject: Bug 265731: multipart_start in the server-push handling code wasn't
 honoring the $cgi->charset setting. r=myk, a=justdave

---
 Bugzilla/CGI.pm | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Bugzilla')

diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
index 537c67da5..b526e6650 100644
--- a/Bugzilla/CGI.pm
+++ b/Bugzilla/CGI.pm
@@ -153,7 +153,10 @@ sub multipart_start {
     my(@header);
     my($self,@p) = @_;
     my($type,@other) = rearrange([['TYPE','CONTENT_TYPE','CONTENT-TYPE']],@p);
+    my $charset = $self->charset;
     $type = $type || 'text/html';
+    $type .= "; charset=$charset" if $type ne '' and $type =~ m!^text/! and $type !~ /\bcharset\b/ and $charset ne '';
+
     push(@header,"Content-Type: $type");
 
     # Add the cookies in if we have any
-- 
cgit v1.2.3-24-g4f1b