Merge pull request #193 from priyadi/received-with-fix

Change Received header ordering when using SSL, to fix interaction problem with Spamassassin
This commit is contained in:
Jared Johnson 2015-01-13 13:00:56 -06:00
commit a97e931231

View File

@ -843,7 +843,7 @@ sub received_line {
$smtp .= "S" if $esmtp; # RFC3848
$sslheader = "("
. $self->connection->notes('tls_socket')->get_cipher()
. " encrypted) ";
. " encrypted)";
}
if (defined $self->{_auth} && $self->{_auth} == OK) {
my $mech = $self->{_auth_mechanism};
@ -869,7 +869,7 @@ sub received_line {
. $self->config('me')
. " (qpsmtpd/"
. $self->version
. ") with $sslheader$smtp; "
. ") with $smtp $sslheader; "
. (strftime('%a, %d %b %Y %H:%M:%S %z', localtime));
}
$self->transaction->header->add('Received', $header_str, 0);