X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FMail.pm;h=d26c860a612f5866576e56944e5c2c529e7eda0c;hb=992f7ab1ad54301080cac1fff3d17cec2745cd07;hp=c19be79662e84b546640d9bddd70bce31ffbc6fa;hpb=271fcc56714cce4e4c8b40ce32f0f30e93433929;p=debbugs.git

diff --git a/Debbugs/Mail.pm b/Debbugs/Mail.pm
index c19be79..d26c860 100644
--- a/Debbugs/Mail.pm
+++ b/Debbugs/Mail.pm
@@ -43,11 +43,12 @@ use base qw(Exporter);
 
 use IPC::Open3;
 use POSIX qw(:sys_wait_h strftime);
-use Time::HiRes qw(usleep);
+use Time::HiRes qw(usleep gettimeofday);
 use Mail::Address ();
 use Debbugs::MIME qw(encode_rfc1522);
 use Debbugs::Config qw(:config);
 use Params::Validate qw(:types validate_with);
+use Encode qw(encode is_utf8);
 
 use Debbugs::Packages;
 
@@ -162,20 +163,19 @@ passed through.
 
 sub default_headers {
     my %param = validate_with(params => \@_,
-			      spec   => {queue_file => {type => SCALAR,
+			      spec   => {queue_file => {type => SCALAR|UNDEF,
 							optional => 1,
 						       },
 					 data       => {type => HASHREF,
 							optional => 1,
 						       },
-					 msgid      => {type => SCALAR,
+					 msgid      => {type => SCALAR|UNDEF,
 							optional => 1,
 						       },
-					 msgtype    => {type => SCALAR,
+					 msgtype    => {type => SCALAR|UNDEF,
 							default => 'misc',
-							optional => 1,
 						       },
-					 pr_msg     => {type => SCALAR,
+					 pr_msg     => {type => SCALAR|UNDEF,
 							default => 'misc',
 						       },
 					 headers    => {type => ARRAYREF,
@@ -185,6 +185,17 @@ sub default_headers {
 			     );
     my @header_order = (qw(X-Loop From To subject),
 			qw(Message-ID In-Reply-To References));
+    # handle various things being undefined
+    if (not exists $param{queue_file} or
+	not defined $param{queue_file}) {
+	$param{queue_file} = join('',gettimeofday())
+    }
+    for (qw(msgtype pr_msg)) {
+	if (not exists $param{$_} or
+	    not defined $param{$_}) {
+	    $param{$_} = 'misc';
+	}
+    }
     my %header_order;
     @header_order{map {lc $_} @header_order} = 0..$#header_order;
     my %set_headers;
@@ -250,7 +261,7 @@ sub default_headers {
 		($header,$default_header{$header});
 	}
 	else {
-	    push @other_headers,($header,$header_order{lc($header)});
+	    push @other_headers,($header,$default_header{$header});
 	}
     }
     my @headers;