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

gitster · gitster · commit ac7acaa5d980 · 2011-11-01T16:12:19.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
@@ -1079,7 +1079,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
`@@ -1079,7 +1079,7 @@ sub send_message {`
`1079`	`1079`	`$smtp_encryption = '';`
`1080`	`1080`	`# Send EHLO again to receive fresh`
`1081`	`1081`	`# supported commands`
`1082`		`- $smtp->hello();`
	`1082`	`+ $smtp->hello($smtp_domain);`
`1083`	`1083`	`} else {`
`1084`	`1084`	`die "Server does not support STARTTLS! ".$smtp->message;`
`1085`	`1085`	`}`