diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-02-25 13:59:02 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-02-25 13:59:02 +0000 |
| commit | 4544525a78f8fb5fb953de0b6bd76b75533054ba (patch) | |
| tree | 8a5a9a0c2a32a3a99014731c021663b8771186c4 | |
| parent | 5984e4bf24c12a45380f8adfe94ae44e66d31ae4 (diff) | |
- Fix Received headers to behave better with SpamAssassin (#1486513)
git-svn-id: https://svn.roundcube.net/trunk@3291 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/sendmail.inc | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index ececfd769..184d06a83 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Fix Received headers to behave better with SpamAssassin (#1486513) - Password: Make passwords encoding consistent with core, add 'password_charset' global option (#1486473) - Fix adding contacts SQL error on mysql (#1486459) - Squirrelmail_usercopy: support reply-to field (#1486506) diff --git a/roundcubemail/program/steps/mail/sendmail.inc b/roundcubemail/program/steps/mail/sendmail.inc index 13c162d96..7e9e89519 100644 --- a/roundcubemail/program/steps/mail/sendmail.inc +++ b/roundcubemail/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; |