Bug 265731: multipart_start in the server-push handling code wasn't honoring the $cgi->charset setting.

r=myk, a=justdave
This commit is contained in:
justdave%bugzilla.org 2004-10-23 09:04:16 +00:00
parent 16e0fa30d4
commit 7dc0b918c5

View File

@ -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