From: justdave%bugzilla.org <>
Date: Sat, 23 Oct 2004 16:05:49 +0000 (+0000)
Subject: Bug 265731: multipart_start in the server-push handling code wasn't honoring the... 
X-Git-Tag: bugzilla-2.18rc3~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b7ee8e9011ee2e70b8de34b5e896664312406a9;p=thirdparty%2Fbugzilla.git

Bug 265731: multipart_start in the server-push handling code wasn't honoring the $cgi->charset setting.
r=myk, a=justdave
---

diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
index 537c67da58..b526e66503 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