diff options
author | Joshua ben Jore <jjore@cpan.org> | 2006-02-18 20:58:10 -0600 |
---|---|---|
committer | Steve Peters <steve@fisharerojo.org> | 2006-02-21 00:40:23 +0000 |
commit | cd755de4750e2191b6465129deed94f5a245ab7e (patch) | |
tree | c8dc0c13c5485e14834bfa14c54f12b4de58b1d5 | |
parent | 5ce57cc063e43c30cba8f7b560bf201c2c4beb83 (diff) | |
download | perl-cd755de4750e2191b6465129deed94f5a245ab7e.tar.gz |
Patches: B, CGI, ExtUtils::MM_Unix
From: "Joshua ben Jore" <twists@gmail.com>
Message-ID: <dc5c751d0602190058t78d915fv78c6318370307b63@mail.gmail.com>
p4raw-id: //depot/perl@27255
-rw-r--r-- | AUTHORS | 1 | ||||
-rw-r--r-- | lib/CGI.pm | 6 |
2 files changed, 6 insertions, 1 deletions
@@ -438,6 +438,7 @@ Jos I. Boumans <kane@dwim.org> Jose Auguste-Etienne <Jose.auguste-etienne@cgss-guyane.fr> Joseph N. Hall <joseph@cscaper.com> Joseph S. Myers <jsm28@hermes.cam.ac.uk> +Joshua ben Jore <jjore@cpan.org> Joshua E. Rodd <jrodd@pbs.org> Joshua Pritikin <joshua.pritikin@db.com> Joost van Baal <J.E.vanBaal@uvt.nl> diff --git a/lib/CGI.pm b/lib/CGI.pm index e93efc08d4..025c83f0df 100644 --- a/lib/CGI.pm +++ b/lib/CGI.pm @@ -1435,7 +1435,11 @@ sub header { ($_ = $header) =~ s/^(\w)(.*)/"\u$1\L$2" . ': '.$self->unescapeHTML($value)/e; } - $type .= "; charset=$charset" if $type ne '' and $type !~ /\bcharset\b/ and $charset ne ''; + $type .= "; charset=$charset" + if $type ne '' + and $type !~ /\bcharset\b/ + and defined $charset + and $charset ne ''; # Maybe future compatibility. Maybe not. my $protocol = $ENV{SERVER_PROTOCOL} || 'HTTP/1.0'; |