Patches: B, CGI, ExtUtils::MM_Unix

From: "Joshua ben Jore" <twists@gmail.com>
Message-ID: <dc5c751d0602190058t78d915fv78c6318370307b63@mail.gmail.com>

p4raw-id: //depot/perl@27255

diff --git a/AUTHORS b/AUTHORS
index 41aef17..d7dcc2d 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -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 e93efc0..025c83f 100644 (file)
--- 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';