Merge branch 'md/smtp-tls-hello-again'

gitster · gitster · commit 54633cd53bf2 · 2011-10-18T21:59:10.000-07:00
* md/smtp-tls-hello-again:
  send-email: Honour SMTP domain when using TLS
diff --git a/git-send-email.perl b/git-send-email.perl
@@ -1098,7 +1098,7 @@ sub send_message {
 					$smtp_encryption = '';
 					# Send EHLO again to receive fresh
 					# supported commands
-					$smtp->hello();
+					$smtp->hello($smtp_domain);
 				} else {
 					die "Server does not support STARTTLS! ".$smtp->message;
 				}

Original file line number	Diff line number	Diff line change
`@@ -1098,7 +1098,7 @@ sub send_message {`
`1098`	`1098`	`$smtp_encryption = '';`
`1099`	`1099`	`# Send EHLO again to receive fresh`
`1100`	`1100`	`# supported commands`
`1101`		`- $smtp->hello();`
	`1101`	`+ $smtp->hello($smtp_domain);`
`1102`	`1102`	`} else {`
`1103`	`1103`	`die "Server does not support STARTTLS! ".$smtp->message;`
`1104`	`1104`	`}`