From 54c992f744ce383044456266efcad6b1048576d9 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Sat, 16 Jun 2007 03:39:37 +0000
Subject: 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

---
 Bugzilla/Mailer.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Bugzilla/Mailer.pm')

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);
-- 
cgit v1.2.3-24-g4f1b