Browse Source

Merge branch 'jm/send-email-tls-auth-on-batch'

"git send-email" when using in a batched mode that limits the
number of messages sent in a single SMTP session lost the contents
of the variable used to choose between tls/ssl, unable to send the
second and later batches, which has been fixed.

* jm/send-email-tls-auth-on-batch:
  send-email: fix tls AUTH when sending batch
maint
Junio C Hamano 7 years ago
parent
commit
d6873a396e
  1. 3
      git-send-email.perl

3
git-send-email.perl

@ -1479,7 +1479,7 @@ EOF @@ -1479,7 +1479,7 @@ EOF
SSL => 1);
}
}
else {
elsif (!$smtp) {
$smtp_server_port ||= 25;
$smtp ||= Net::SMTP->new($smtp_server,
Hello => $smtp_domain,
@ -1501,7 +1501,6 @@ EOF @@ -1501,7 +1501,6 @@ EOF
$smtp->starttls(ssl_verify_params())
or die sprintf(__("STARTTLS failed! %s"), IO::Socket::SSL::errstr());
}
$smtp_encryption = '';
# Send EHLO again to receive fresh
# supported commands
$smtp->hello($smtp_domain);

Loading…
Cancel
Save