Merge branch 'dk/send-email-avoid-net-smtp-ssl-when-able'

A hotfix to a topic in 'master'.

* dk/send-email-avoid-net-smtp-ssl-when-able:
  send-email: Net::SMTP::starttls was introduced in v2.34
This commit is contained in:
Junio C Hamano
2017-06-02 15:05:59 +09:00

View File

@ -1355,7 +1355,7 @@ EOF
} }
require Net::SMTP; require Net::SMTP;
my $use_net_smtp_ssl = version->parse($Net::SMTP::VERSION) < version->parse("1.28"); my $use_net_smtp_ssl = version->parse($Net::SMTP::VERSION) < version->parse("2.34");
$smtp_domain ||= maildomain(); $smtp_domain ||= maildomain();
if ($smtp_encryption eq 'ssl') { if ($smtp_encryption eq 'ssl') {