diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-15 19:28:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-15 19:28:50 +0200 |
| commit | f23777cda979f4bfb9fe36bf7c7ef75e955791b8 (patch) | |
| tree | 97eddfc49def378d7dc7c4caaf1acc3af69fe669 /git-send-email.perl | |
| parent | Merge branch 'fg/submodule-clone-depth' (diff) | |
| parent | send-email: provide port separately from hostname (diff) | |
| download | git-f23777cda979f4bfb9fe36bf7c7ef75e955791b8.tar.xz git-f23777cda979f4bfb9fe36bf7c7ef75e955791b8.zip | |
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-x | git-send-email.perl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index ecbf56f693..45c3863377 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'); |