summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorjustdave%bugzilla.org <>2004-10-23 18:04:16 +0200
committerjustdave%bugzilla.org <>2004-10-23 18:04:16 +0200
commit8100ea2228ab8a9836968c5def84b0cb6d473688 (patch)
tree326210916b3544d8b9be8a0e6d3c8c302d9f0d41 /Bugzilla
parentc43a96bb27b2d8312f23845088a9e0bfafdc3a5f (diff)
downloadbugzilla-8100ea2228ab8a9836968c5def84b0cb6d473688.tar.gz
bugzilla-8100ea2228ab8a9836968c5def84b0cb6d473688.tar.xz
Bug 265731: multipart_start in the server-push handling code wasn't honoring the $cgi->charset setting.
r=myk, a=justdave
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/CGI.pm3
1 files changed, 3 insertions, 0 deletions
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