aboutsummaryrefslogtreecommitdiff
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-15 10:28:50 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-15 10:28:50 -0700
commitf23777cda979f4bfb9fe36bf7c7ef75e955791b8 (patch)
tree97eddfc49def378d7dc7c4caaf1acc3af69fe669 /git-send-email.perl
parent2bb7aface663f4d9f01d08282ee38cf8f636df0d (diff)
parent1a741bf73f898e6deb396dcc8b8d2d162798e616 (diff)
downloadgit-f23777cda979f4bfb9fe36bf7c7ef75e955791b8.tar.gz
git-f23777cda979f4bfb9fe36bf7c7ef75e955791b8.tar.xz
Merge branch 'bc/send-email-use-port-as-separate-param'
Pass port number as a separate argument when send-email initializes Net::SMTP, instead of as a part of the hostname, i.e. host:port. This allows GSSAPI codepath to match with the hostname given. * bc/send-email-use-port-as-separate-param: send-email: provide port separately from hostname
Diffstat (limited to 'git-send-email.perl')
-rwxr-xr-xgit-send-email.perl6
1 files changed, 4 insertions, 2 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index ecbf56f69..45c386337 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -1188,9 +1188,11 @@ X-Mailer: git-send-email $gitversion
else {
require Net::SMTP;
$smtp_domain ||= maildomain();
- $smtp ||= Net::SMTP->new(smtp_host_string(),
+ $smtp_server_port ||= 25;
+ $smtp ||= Net::SMTP->new($smtp_server,
Hello => $smtp_domain,
- Debug => $debug_net_smtp);
+ Debug => $debug_net_smtp,
+ Port => $smtp_server_port);
if ($smtp_encryption eq 'tls' && $smtp) {
require Net::SMTP::SSL;
$smtp->command('STARTTLS');