Skip to content

Commit d6873a3

Browse files
committed
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
2 parents cd3f067 + 636f3d7 commit d6873a3

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

git-send-email.perl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1479,7 +1479,7 @@ sub send_message {
14791479
SSL => 1);
14801480
}
14811481
}
1482-
else {
1482+
elsif (!$smtp) {
14831483
$smtp_server_port ||= 25;
14841484
$smtp ||= Net::SMTP->new($smtp_server,
14851485
Hello => $smtp_domain,
@@ -1501,7 +1501,6 @@ sub send_message {
15011501
$smtp->starttls(ssl_verify_params())
15021502
or die sprintf(__("STARTTLS failed! %s"), IO::Socket::SSL::errstr());
15031503
}
1504-
$smtp_encryption = '';
15051504
# Send EHLO again to receive fresh
15061505
# supported commands
15071506
$smtp->hello($smtp_domain);

0 commit comments

Comments
 (0)