git-send-email: Do not attempt to STARTTLS more than once

trast · gitster · commit 6cbf8b00fb27 · 2008-07-02T22:41:18.000-07:00
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 &lt;trast@student.ethz.ch&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/git-send-email.perl b/git-send-email.perl
@@ -772,6 +772,7 @@ sub send_message
 				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;
 				}

Original file line number	Diff line number	Diff line change
`@@ -772,6 +772,7 @@ sub send_message`
`772`	`772`	`if ($smtp->code == 220) {`
`773`	`773`	`$smtp = Net::SMTP::SSL->start_SSL($smtp)`
`774`	`774`	`or die "STARTTLS failed! ".$smtp->message;`
	`775`	`+ $smtp_encryption = '';`
`775`	`776`	`} else {`
`776`	`777`	`die "Server does not support STARTTLS! ".$smtp->message;`
`777`	`778`	`}`