Bug 265731: multipart_start in the server-push handling code wasn't honoring the…

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

Bug 265731: multipart_start in the server-push handling code wasn't honoring the…
8100ea22 · justdave%bugzilla.org · c43a96bb · 8100ea22
Commit 8100ea22 authored Oct 23, 2004 by justdave%bugzilla.org
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

CGI.pm Bugzilla/CGI.pm +3 -0

No files found.
--- 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