byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Qpsmtpd/SMTP.pm
View File

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