summaryrefslogtreecommitdiff
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2008-07-03 00:11:31 +0200
committerJunio C Hamano <gitster@pobox.com>2008-07-02 22:41:18 -0700
commit6cbf8b00fb27f5f55f1a5645ba60c451cb090fc1 (patch)
treef1351197714f65935acab8196be903cab7e696d1 /git-send-email.perl
parentbb1ab2db08f48add4236a5a9c08aa1a6aa4d5d48 (diff)
downloadgit-6cbf8b00fb27f5f55f1a5645ba60c451cb090fc1.tar.gz
git-send-email: Do not attempt to STARTTLS more than once
With the previous TLS patch, send-email would attempt to STARTTLS at the beginning of every mail, despite reusing the last connection. We simply skip further encryption checks after successful TLS initiation. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-send-email.perl')
-rwxr-xr-xgit-send-email.perl1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index a047b016e3..3564419e81 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -772,6 +772,7 @@ X-Mailer: git-send-email $gitversion
if ($smtp->code == 220) {
$smtp = Net::SMTP::SSL->start_SSL($smtp)
or die "STARTTLS failed! ".$smtp->message;
+ $smtp_encryption = '';
} else {
die "Server does not support STARTTLS! ".$smtp->message;
}