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

Bug 384501: If you have a port name in the urlbase, SMTP may not work
54c992f7 · mkanat%bugzilla.org · 8cb6f0fa · 54c992f7
Commit 54c992f7 authored Jun 16, 2007 by mkanat%bugzilla.org
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Mailer.pm Bugzilla/Mailer.pm +1 -1

No files found.
--- 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);