undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

send-email: Change from Mail::Sendmail to Net::SMTP

Browse Source 
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 <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Eric Wong 2006-03-25 17:20:48 -08:00 committed by Junio C Hamano
parent 72095d5c37
commit 4bc87a28be
1 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
git-send-email.perl
View File

@ -19,11 +19,17 @@
use strict; use strict;
use warnings; use warnings;
use Term::ReadLine; use Term::ReadLine;
use Mail::Sendmail qw(sendmail %mailcfg);
use Getopt::Long; use Getopt::Long;
use Data::Dumper; use Data::Dumper;
use Net::SMTP;
use Email::Valid; 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 unique_email_list(@);
sub cleanup_compose_files(); sub cleanup_compose_files();
@ -270,35 +276,45 @@ $cc = "";
sub send_message 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, my $header = "From: $from
From => $from, To: $to
CC => $cc, Cc: $cc
Subject => $subject, Subject: $subject
Message => $message, Reply-To: $from
'Reply-to' => $from, Date: $date
'In-Reply-To' => $reply_to, Message-Id: $message_id
'Message-ID' => $message_id, X-Mailer: git-send-email @@GIT_VERSION@@
'X-Mailer' => "git-send-email", ";
); $header .= "In-Reply-To: $reply_to\n" if $reply_to;
$mail{smtp} = $smtp_server; $smtp ||= Net::SMTP->new( $smtp_server );
$mailcfg{mime} = 0; $smtp->mail( $from ) or die $smtp->message;
$smtp->to( @recipients ) or die $smtp->message;
#print Data::Dumper->Dump([\%mail],[qw(*mail)]); $smtp->data or die $smtp->message;
$smtp->datasend("$header\n$message") or die $smtp->message;
sendmail(%mail) or die $Mail::Sendmail::error; $smtp->dataend() or die $smtp->message;
$smtp->ok or die "Failed to send $subject\n".$smtp->message;
if ($quiet) { if ($quiet) {
printf "Sent %s\n", $subject; printf "Sent %s\n", $subject;
} else { } else {
print "OK. Log says:\n", $Mail::Sendmail::log; print "OK. Log says:
print "\n\n" 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; $reply_to = $initial_reply_to;
make_message_id(); make_message_id();
$subject = $initial_subject; $subject = $initial_subject;
@ -389,7 +405,7 @@ sub cleanup_compose_files() {
} }
$smtp->quit if $smtp;
sub unique_email_list(@) { sub unique_email_list(@) {
my %seen; my %seen;