summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2014-10-21 20:30:38 +0200
committerDylan William Hardison <dylan@hardison.net>2014-10-21 20:30:38 +0200
commit226b92c37fed3616a2c9d23693ed9a4321bb879f (patch)
treec12058d111dc646fdc7b5ea2cb8a425f90220bff
parent676ae49989afef0721ca846b8ac7572e50933793 (diff)
downloadbugzilla-226b92c37fed3616a2c9d23693ed9a4321bb879f.tar.gz
bugzilla-226b92c37fed3616a2c9d23693ed9a4321bb879f.tar.xz
Bug 1073380 - Pass the hostname and port as two separate arguments to Email::Sender
r=dkl a=glob
-rw-r--r--Bugzilla/Mailer.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm
index 01e0dc255..4447d4046 100644
--- 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,