diff options
| author | mkanat%bugzilla.org <> | 2007-06-16 05:39:37 +0200 |
|---|---|---|
| committer | mkanat%bugzilla.org <> | 2007-06-16 05:39:37 +0200 |
| commit | 54c992f744ce383044456266efcad6b1048576d9 (patch) | |
| tree | a68101882bc526a0d28c4888fc810fdf386a4f81 /Bugzilla/Mailer.pm | |
| parent | 8cb6f0fa771a8c3c2374c8b2fcb7d4f2e5048ed5 (diff) | |
| download | bugzilla-54c992f744ce383044456266efcad6b1048576d9.tar.gz bugzilla-54c992f744ce383044456266efcad6b1048576d9.tar.xz | |
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
Diffstat (limited to 'Bugzilla/Mailer.pm')
| -rw-r--r-- | Bugzilla/Mailer.pm | 2 |
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); |