summaryrefslogtreecommitdiffstats
path: root/Bugzilla/Mailer.pm
diff options
context:
space:
mode:
authorByron Jones <bjones@mozilla.com>2012-08-30 10:35:18 +0200
committerByron Jones <bjones@mozilla.com>2012-08-30 10:35:18 +0200
commit492a7b7ed5881b827a48857cec2f315d155fddc8 (patch)
treea82c457265f0c1cd0bf8da445924b36740e20b25 /Bugzilla/Mailer.pm
parent7bb45bbc6d445df6112e038bfa3853440249b217 (diff)
downloadbugzilla-492a7b7ed5881b827a48857cec2f315d155fddc8.tar.gz
bugzilla-492a7b7ed5881b827a48857cec2f315d155fddc8.tar.xz
Add x-generated-by header to bugmail
Diffstat (limited to 'Bugzilla/Mailer.pm')
-rw-r--r--Bugzilla/Mailer.pm7
1 files changed, 7 insertions, 0 deletions
diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm
index 74c9010c2..d27f79155 100644
--- a/Bugzilla/Mailer.pm
+++ b/Bugzilla/Mailer.pm
@@ -49,6 +49,7 @@ use Encode::MIME::Header;
use Email::Address;
use Email::MIME;
use Email::Send;
+use Sys::Hostname;
sub MessageToMTA {
my ($msg, $send_now) = (@_);
@@ -142,6 +143,12 @@ sub MessageToMTA {
}
}
+ # For tracking/diagnostic purposes, add our hostname
+ my $generated_by = $email->header('X-Generated-By') || '';
+ if ($generated_by =~ tr/\/// < 3) {
+ $email->header_set('X-Generated-By' => $generated_by . '/' . hostname() . "($$)");
+ }
+
if ($method eq "SMTP") {
push @args, Host => Bugzilla->params->{"smtpserver"},
username => Bugzilla->params->{"smtp_username"},