Merge branch 'jc/maint-name-rev-all' into maint

diff --git a/git-send-email.perl b/git-send-email.perl
index 76565de2ee517f48001ffacca32e3c08320cfe38..5790744ae3fd89f83a229f964a5603df94e05c83 100755 (executable)
--- 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;
                                }
@@ -1091,7 +1091,7 @@ sub send_message {
                            "VALUES: server=$smtp_server ",
                            "encryption=$smtp_encryption ",
                            "hello=$smtp_domain",
-                           defined $smtp_server_port ? "port=$smtp_server_port" : "";
+                           defined $smtp_server_port ? " port=$smtp_server_port" : "";
                }
 
                if (defined $smtp_authuser) {