summaryrefslogtreecommitdiff
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorLibravatar Jules Maselbas <jules.maselbas@grenoble-inp.org>2018-07-14 10:58:48 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-16 15:02:36 -0700
commit636f3d7ac51372276a8bfe940395661015ad1ef6 (patch)
tree03fce62132a905708e04b1356f2f44c29cb4712d /git-send-email.perl
parentGit 2.18 (diff)
downloadtgif-636f3d7ac51372276a8bfe940395661015ad1ef6.tar.xz
send-email: fix tls AUTH when sending batch
The variable smtp_encryption must keep it's value between two batches. Otherwise the authentication is skipped after the first batch. Signed-off-by: Jules Maselbas <jules.maselbas@grenoble-inp.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-send-email.perl')
-rwxr-xr-xgit-send-email.perl3
1 files changed, 1 insertions, 2 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index 8ec70e58ed..1f9a73f743 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -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
$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);