add test for version.cgi cache control

[debbugs.git] / Debbugs / MIME.pm

diff --git a/Debbugs/MIME.pm b/Debbugs/MIME.pm
index 15078f2c18929f535e8ff83da7958c053f7e522a..aae3b58d9b543329655433c20cda808333bf06c1 100644 (file)
--- a/Debbugs/MIME.pm
+++ b/Debbugs/MIME.pm
@@ -49,8 +49,8 @@ BEGIN {
     $EXPORT_TAGS{all} = [@EXPORT_OK];
 }
 
-use File::Path;
-use File::Temp qw();
+use File::Path qw(remove_tree);
+use File::Temp qw(tempdir);
 use MIME::Parser;
 
 use POSIX qw(strftime);
@@ -94,7 +94,7 @@ sub parse
     my (@headerlines, @bodylines);
 
     my $parser = MIME::Parser->new();
-    my $tempdir = File::Temp::tempdir();
+    my $tempdir = tempdir(CLEANUP => 1);
     $parser->output_under($tempdir);
     my $entity = eval { $parser->parse_data($_[0]) };
 
@@ -135,7 +135,7 @@ sub parse
        @bodylines = map {convert_to_utf8($_,$charset)} @msg[$i .. $#msg];
     }
 
-    rmtree $tempdir, 0, 1;
+    remove_tree($tempdir,{verbose => 0, safe => 1});
 
     # Remove blank lines.
     shift @bodylines while @bodylines and $bodylines[0] !~ /\S/;
@@ -193,7 +193,7 @@ sub create_mime_message{
      die "The third argument to create_mime_message must be an arrayref" unless ref($attachments) eq 'ARRAY';
 
      if ($include_date) {
-        my %headers = apply {lc($_)} @{$headers};
+        my %headers = apply {defined $_ ? lc($_) : ''} @{$headers};
         if (not exists $headers{date}) {
             push @{$headers},
                 ('Date',
@@ -206,7 +206,7 @@ sub create_mime_message{
      # MIME::Entity is stupid, and doesn't rfc1522 encode its headers, so we do it for it.
      my $msg = MIME::Entity->build('Content-Type' => 'text/plain; charset=utf-8',
                                   'Encoding'     => 'quoted-printable',
-                                  (map{encode_rfc1522(encode_utf8($_))} @{$headers}),
+                                  (map{encode_rfc1522(encode_utf8(defined $_ ? $_:''))} @{$headers}),
                                   Data    => encode_utf8($body),
                                  );