Merge branch 'jm/send-email-tls-auth-on-batch'

gitster · gitster · commit d6873a396e05 · 2018-08-02T15:30:46.000-07:00
"git send-email" when using in a batched mode that limits the
number of messages sent in a single SMTP session lost the contents
of the variable used to choose between tls/ssl, unable to send the
second and later batches, which has been fixed.

* jm/send-email-tls-auth-on-batch:
  send-email: fix tls AUTH when sending batch
diff --git a/git-send-email.perl b/git-send-email.perl
@@ -1479,7 +1479,7 @@ sub send_message {
 							 SSL => 1);
 			}
 		}
-		else {
+		elsif (!$smtp) {
 			$smtp_server_port ||= 25;
 			$smtp ||= Net::SMTP->new($smtp_server,
 						 Hello => $smtp_domain,
@@ -1501,7 +1501,6 @@ sub send_message {
 					$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);

Original file line number	Diff line number	Diff line change
`@@ -1479,7 +1479,7 @@ sub send_message {`
`1479`	`1479`	`SSL => 1);`
`1480`	`1480`	`}`
`1481`	`1481`	`}`
`1482`		`- else {`
	`1482`	`+ elsif (!$smtp) {`
`1483`	`1483`	`$smtp_server_port \|\|= 25;`
`1484`	`1484`	`$smtp \|\|= Net::SMTP->new($smtp_server,`
`1485`	`1485`	`Hello => $smtp_domain,`
`@@ -1501,7 +1501,6 @@ sub send_message {`
`1501`	`1501`	`$smtp->starttls(ssl_verify_params())`
`1502`	`1502`	`or die sprintf(__("STARTTLS failed! %s"), IO::Socket::SSL::errstr());`
`1503`	`1503`	`}`
`1504`		`- $smtp_encryption = '';`
`1505`	`1504`	`# Send EHLO again to receive fresh`
`1506`	`1505`	`# supported commands`
`1507`	`1506`	`$smtp->hello($smtp_domain);`