summaryrefslogtreecommitdiff
path: root/program/steps/mail/sendmail.inc
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-02-25 13:59:02 +0000
committeralecpl <alec@alec.pl>2010-02-25 13:59:02 +0000
commit82c98e674dde384575b992e7d3ea7057fe9e7d78 (patch)
treefab5dee1cac7d5efae9d9bd98069b603630df8c2 /program/steps/mail/sendmail.inc
parente62346c9ba9b27ecf8c7b322ac9d7a4bb25bca48 (diff)
- Fix Received headers to behave better with SpamAssassin (#1486513)
Diffstat (limited to 'program/steps/mail/sendmail.inc')
-rw-r--r--program/steps/mail/sendmail.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 13c162d96..7e9e89519 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -260,8 +260,8 @@ if ($CONFIG['http_received_header'])
$http_header .= ' ('. rcmail_encrypt_header($host) . ')';
} else {
$http_header .= (($host != $hostname) ? $hostname : '[' . $host . ']');
- $http_header .= ' ('. ($host == $hostname ? '' : $hostname . ' ') .
- '[' . $host .'])';
+ if ($host != $hostname)
+ $http_header .= ' (['. $host .'])';
}
$http_header .= $nldlm . ' via ';
}
@@ -273,14 +273,14 @@ if ($CONFIG['http_received_header'])
$http_header .= ' ('. rcmail_encrypt_header($host) . ')';
} else {
$http_header .= (($host != $hostname) ? $hostname : '[' . $host . ']');
- $http_header .= ' ('. ($host == $hostname ? '' : $hostname . ' ') .
- '[' . $host .'])';
+ if ($host != $hostname)
+ $http_header .= ' (['. $host .'])';
}
// BY
$http_header .= $nldlm . 'by ' . $_SERVER['HTTP_HOST'];
// WITH
- $http_header .= $nldlm . 'with ' . $_SERVER['SERVER_PROTOCOL'] .
- ' ('.$_SERVER['REQUEST_METHOD'] . '); ' . date('r');
+ $http_header .= $nldlm . 'with HTTP (' . $_SERVER['SERVER_PROTOCOL'] .
+ ' '.$_SERVER['REQUEST_METHOD'] . '); ' . date('r');
$http_header = wordwrap($http_header, 69, $nldlm);
$headers['Received'] = $http_header;