зеркало из https://github.com/microsoft/git.git
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
This commit is contained in:
Коммит
d6873a396e
|
@ -1479,7 +1479,7 @@ EOF
|
||||||
SSL => 1);
|
SSL => 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
elsif (!$smtp) {
|
||||||
$smtp_server_port ||= 25;
|
$smtp_server_port ||= 25;
|
||||||
$smtp ||= Net::SMTP->new($smtp_server,
|
$smtp ||= Net::SMTP->new($smtp_server,
|
||||||
Hello => $smtp_domain,
|
Hello => $smtp_domain,
|
||||||
|
@ -1501,7 +1501,6 @@ EOF
|
||||||
$smtp->starttls(ssl_verify_params())
|
$smtp->starttls(ssl_verify_params())
|
||||||
or die sprintf(__("STARTTLS failed! %s"), IO::Socket::SSL::errstr());
|
or die sprintf(__("STARTTLS failed! %s"), IO::Socket::SSL::errstr());
|
||||||
}
|
}
|
||||||
$smtp_encryption = '';
|
|
||||||
# Send EHLO again to receive fresh
|
# Send EHLO again to receive fresh
|
||||||
# supported commands
|
# supported commands
|
||||||
$smtp->hello($smtp_domain);
|
$smtp->hello($smtp_domain);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче