Bug 1073380 - Pass the hostname and port as two separate arguments to Email::Sender

r=dkl a=glob

diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm
index 01e0dc25597563780b615258bb08cfc7f169cb02..4447d4046207001829f68aeb8e487e609f98c09d 100644 (file)
--- a/Bugzilla/Mailer.pm
+++ b/Bugzilla/Mailer.pm
@@ -127,9 +127,11 @@ sub MessageToMTA {
     }
 
     if ($method eq "SMTP") {
+        my ($host, $port) = split(/:/, Bugzilla->params->{'smtpserver'}, 2);
         $transport = Bugzilla->request_cache->{smtp} //=
           Email::Sender::Transport::SMTP::Persistent->new({
-            host  => Bugzilla->params->{'smtpserver'},
+            host  => $host,
+            defined($port) ? (port => $port) : (),
             sasl_username => Bugzilla->params->{'smtp_username'},
             sasl_password => Bugzilla->params->{'smtp_password'},
             helo => $hostname,