From 72095d5c3779344de13c47a8b1cb163b2d94126e Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 25 Mar 2006 02:43:31 -0800 Subject: [PATCH 1/4] send-email: use built-in time() instead of /bin/date '+%s' Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- git-send-email.perl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index b220d11cc1..7c27eed7ba 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -258,8 +258,7 @@ my $message_id_template = "<%s-git-send-email-$message_id_from>"; sub make_message_id { - my $date = `date "+\%s"`; - chomp($date); + my $date = time; my $pseudo_rand = int (rand(4200)); $message_id = sprintf $message_id_template, "$date$pseudo_rand"; #print "new message id = $message_id\n"; # Was useful for debugging From 4bc87a28be020a6bf7387161c65ea3d8e4a0228b Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 25 Mar 2006 17:20:48 -0800 Subject: [PATCH 2/4] send-email: Change from Mail::Sendmail to Net::SMTP Net::SMTP is in the base Perl distribution, so users are more likely to have it. Net::SMTP also allows reusing the SMTP connection, so sending multiple emails is faster. [jc: tweaked X-Mailer further while we are at it.] Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- git-send-email.perl | 60 ++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 22 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 7c27eed7ba..e578aff7ae 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -19,11 +19,17 @@ use strict; use warnings; use Term::ReadLine; -use Mail::Sendmail qw(sendmail %mailcfg); use Getopt::Long; use Data::Dumper; +use Net::SMTP; use Email::Valid; +# most mail servers generate the Date: header, but not all... +$ENV{LC_ALL} = 'C'; +use POSIX qw/strftime/; + +my $smtp; + sub unique_email_list(@); sub cleanup_compose_files(); @@ -270,35 +276,45 @@ $cc = ""; sub send_message { - my $to = join (", ", unique_email_list(@to)); + my @recipients = unique_email_list(@to); + my $to = join (",\n\t", @recipients); + @recipients = unique_email_list(@recipients,@cc); + my $date = strftime('%a, %d %b %Y %H:%M:%S %z', localtime(time)); - %mail = ( To => $to, - From => $from, - CC => $cc, - Subject => $subject, - Message => $message, - 'Reply-to' => $from, - 'In-Reply-To' => $reply_to, - 'Message-ID' => $message_id, - 'X-Mailer' => "git-send-email", - ); + my $header = "From: $from +To: $to +Cc: $cc +Subject: $subject +Reply-To: $from +Date: $date +Message-Id: $message_id +X-Mailer: git-send-email @@GIT_VERSION@@ +"; + $header .= "In-Reply-To: $reply_to\n" if $reply_to; - $mail{smtp} = $smtp_server; - $mailcfg{mime} = 0; - - #print Data::Dumper->Dump([\%mail],[qw(*mail)]); - - sendmail(%mail) or die $Mail::Sendmail::error; + $smtp ||= Net::SMTP->new( $smtp_server ); + $smtp->mail( $from ) or die $smtp->message; + $smtp->to( @recipients ) or die $smtp->message; + $smtp->data or die $smtp->message; + $smtp->datasend("$header\n$message") or die $smtp->message; + $smtp->dataend() or die $smtp->message; + $smtp->ok or die "Failed to send $subject\n".$smtp->message; if ($quiet) { printf "Sent %s\n", $subject; } else { - print "OK. Log says:\n", $Mail::Sendmail::log; - print "\n\n" + print "OK. Log says: +Date: $date +Server: $smtp_server Port: 25 +From: $from +Subject: $subject +Cc: $cc +To: $to + +Result: ", $smtp->code, ' ', ($smtp->message =~ /\n([^\n]+\n)$/s), "\n"; } } - $reply_to = $initial_reply_to; make_message_id(); $subject = $initial_subject; @@ -389,7 +405,7 @@ sub cleanup_compose_files() { } - +$smtp->quit if $smtp; sub unique_email_list(@) { my %seen; From a5370b16c34993c1d0f65171d5704244901e005b Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 25 Mar 2006 03:01:01 -0800 Subject: [PATCH 3/4] send-email: try to order messages in email clients more correctly If --no-chain-reply-to is set, patches may not always be ordered correctly in email clients. This patch makes sure each email sent from a different second. I chose to start with a time (slightly) in the past because those are probably more likely in real-world usage and spam filters might be more tolerant of them. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- git-send-email.perl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index e578aff7ae..d2af98ac0c 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -37,7 +37,7 @@ sub cleanup_compose_files(); my $compose_filename = ".msg.$$"; # Variables we fill in automatically, or via prompting: -my (@to,@cc,@initial_cc,$initial_reply_to,$initial_subject,@files,$from,$compose); +my (@to,@cc,@initial_cc,$initial_reply_to,$initial_subject,@files,$from,$compose,$time); # Behavior modification variables my ($chain_reply_to, $smtp_server, $quiet, $suppress_from, $no_signed_off_cc) = (1, "localhost", 0, 0, 0); @@ -273,13 +273,14 @@ sub make_message_id $cc = ""; +$time = time - scalar $#files; sub send_message { my @recipients = unique_email_list(@to); my $to = join (",\n\t", @recipients); @recipients = unique_email_list(@recipients,@cc); - my $date = strftime('%a, %d %b %Y %H:%M:%S %z', localtime(time)); + my $date = strftime('%a, %d %b %Y %H:%M:%S %z', localtime($time++)); my $header = "From: $from To: $to From 567ffeb7722eefab3991cb894c96548b92b57cc2 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 25 Mar 2006 16:47:12 -0800 Subject: [PATCH 4/4] send-email: lazy-load Email::Valid and make it optional It's not installed on enough machines, and is overkill most of the time. We'll fallback to a very basic regexp just in case, but nothing like the monster regexp Email::Valid has to offer :) Small cleanup from Merlyn. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- git-send-email.perl | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index d2af98ac0c..ecfa347b85 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -22,12 +22,12 @@ use Term::ReadLine; use Getopt::Long; use Data::Dumper; use Net::SMTP; -use Email::Valid; # most mail servers generate the Date: header, but not all... $ENV{LC_ALL} = 'C'; use POSIX qw/strftime/; +my $have_email_valid = eval { require Email::Valid; 1 }; my $smtp; sub unique_email_list(@); @@ -250,6 +250,16 @@ EOT # Variables we set as part of the loop over files our ($message_id, $cc, %mail, $subject, $reply_to, $message); +sub extract_valid_address { + my $address = shift; + if ($have_email_valid) { + return Email::Valid->address($address); + } else { + # less robust/correct than the monster regexp in Email::Valid, + # but still does a 99% job, and one less dependency + return ($address =~ /([^\"<>\s]+@[^<>\s]+)/); + } +} # Usually don't need to change anything below here. @@ -259,7 +269,7 @@ our ($message_id, $cc, %mail, $subject, $reply_to, $message); # 1 second since the last time we were called. # We'll setup a template for the message id, using the "from" address: -my $message_id_from = Email::Valid->address($from); +my $message_id_from = extract_valid_address($from); my $message_id_template = "<%s-git-send-email-$message_id_from>"; sub make_message_id @@ -413,7 +423,7 @@ sub unique_email_list(@) { my @emails; foreach my $entry (@_) { - my $clean = Email::Valid->address($entry); + my $clean = extract_valid_address($entry); next if $seen{$clean}++; push @emails, $entry; }