You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2012/05/14 16:15:34 UTC
svn commit: r1338216 -
/spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
Author: mmartinec
Date: Mon May 14 14:15:34 2012
New Revision: 1338216
URL: http://svn.apache.org/viewvc?rev=1338216&view=rev
Log:
Bug 6759: "ESMTPA;" not detected by Received.pm (recognize semicolon as a terminator)
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm?rev=1338216&r1=1338215&r2=1338216&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm Mon May 14 14:15:34 2012
@@ -399,11 +399,12 @@ sub parse_received_line {
# try to catch authenticated message identifier
#
- # with ESMTPA, ESMTPSA, LMTPA, LMTPSA should cover RFC 3848 compliant MTAs
+ # with ESMTPA, ESMTPSA, LMTPA, LMTPSA should cover RFC 3848 compliant MTAs,
+ # UTF8SMTPA and UTF8LMTPA are covered by RFC 4954 and RFC 6531,
# with ASMTP (Authenticated SMTP) is used by Earthlink, Exim 4.34, and others
# with HTTP should only be authenticated webmail sessions
# with HTTPU is used by Communigate Pro with Pronto! webmail interface
- if (/ by / && / with (ESMTPA|ESMTPSA|LMTPA|LMTPSA|ASMTP|HTTPU?)(?: |$)/i) {
+ if (/ by / && / with ((?:ES|L|UTF8S|UTF8L)MTPS?A|ASMTP|HTTPU?)(?: |;|$)/i) {
$auth = $1;
}
# GMail should use ESMTPSA to indicate that it is in fact authenticated,