aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkanat%bugzilla.org <>2007-06-16 03:39:37 +0000
committermkanat%bugzilla.org <>2007-06-16 03:39:37 +0000
commit54c992f744ce383044456266efcad6b1048576d9 (patch)
treea68101882bc526a0d28c4888fc810fdf386a4f81
parent8cb6f0fa771a8c3c2374c8b2fcb7d4f2e5048ed5 (diff)
downloadbugs-54c992f744ce383044456266efcad6b1048576d9.tar
bugs-54c992f744ce383044456266efcad6b1048576d9.tar.gz
bugs-54c992f744ce383044456266efcad6b1048576d9.tar.bz2
bugs-54c992f744ce383044456266efcad6b1048576d9.tar.xz
bugs-54c992f744ce383044456266efcad6b1048576d9.zip
Bug 384501: If you have a port name in the urlbase, SMTP may not work
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=LpSolit
-rw-r--r--Bugzilla/Mailer.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm
index e0f598b3d..1d4a90a4f 100644
--- a/Bugzilla/Mailer.pm
+++ b/Bugzilla/Mailer.pm
@@ -87,7 +87,7 @@ sub MessageToMTA {
# Sendmail will automatically append our hostname to the From
# address, but other mailers won't.
my $urlbase = Bugzilla->params->{'urlbase'};
- $urlbase =~ m|//([^/]+)/?|;
+ $urlbase =~ m|//([^:/]+)[:/]?|;
$hostname = $1;
$from .= "\@$hostname" if $from !~ /@/;
$email->header_set('From', $from);