mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'tr/send-email-ssl' into maint
SSL-related options were not passed correctly to underlying socket layer in "git send-email". * tr/send-email-ssl: send-email: set SSL options through IO::Socket::SSL::set_client_defaults send-email: --smtp-ssl-cert-path takes an argument send-email: pass Debug to Net::SMTP::SSL::new
This commit is contained in:
commit
ac0835f94b
|
@ -291,7 +291,7 @@ sub signal_handler {
|
|||
"smtp-pass:s" => \$smtp_authpass,
|
||||
"smtp-ssl" => sub { $smtp_encryption = 'ssl' },
|
||||
"smtp-encryption=s" => \$smtp_encryption,
|
||||
"smtp-ssl-cert-path" => \$smtp_ssl_cert_path,
|
||||
"smtp-ssl-cert-path=s" => \$smtp_ssl_cert_path,
|
||||
"smtp-debug:i" => \$debug_net_smtp,
|
||||
"smtp-domain:s" => \$smtp_domain,
|
||||
"identity=s" => \$identity,
|
||||
|
@ -1214,10 +1214,14 @@ sub send_message {
|
|||
$smtp_server_port ||= 465; # ssmtp
|
||||
require Net::SMTP::SSL;
|
||||
$smtp_domain ||= maildomain();
|
||||
require IO::Socket::SSL;
|
||||
# Net::SMTP::SSL->new() does not forward any SSL options
|
||||
IO::Socket::SSL::set_client_defaults(
|
||||
ssl_verify_params());
|
||||
$smtp ||= Net::SMTP::SSL->new($smtp_server,
|
||||
Hello => $smtp_domain,
|
||||
Port => $smtp_server_port,
|
||||
ssl_verify_params());
|
||||
Debug => $debug_net_smtp);
|
||||
}
|
||||
else {
|
||||
require Net::SMTP;
|
||||
|
|
Loading…
Reference in a new issue