From a8e435d576c79c11c0700ebfa8bf0d2bfd58ec54 Mon Sep 17 00:00:00 2001 From: "mkanat%bugzilla.org" Date: Fri, 15 Jun 2007 22:40:53 +0000 Subject: [PATCH] Bug 384501: If you have a port name in the urlbase, SMTP may not work Patch By Max Kanat-Alexander r=LpSolit, a=LpSolit git-svn-id: svn://10.0.0.236/trunk@228151 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webtools/bugzilla/Bugzilla/Mailer.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm b/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm index e0f598b3dfb..1d4a90a4f6d 100644 --- a/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm +++ b/mozilla/webtools/bugzilla/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);