You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by km...@apache.org on 2012/05/15 14:09:54 UTC
svn commit: r1338665 -
/spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
Author: kmcgrail
Date: Tue May 15 12:09:53 2012
New Revision: 1338665
URL: http://svn.apache.org/viewvc?rev=1338665&view=rev
Log:
more parsing cleanup thanks to Adam Katz per bug 6549
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=1338665&r1=1338664&r2=1338665&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm Tue May 15 12:09:53 2012
@@ -450,7 +450,7 @@ sub parse_received_line {
# Expanded to NaSMail Bug 6783
if (/ \((?:SquirrelMail|NaSMail) authenticated user /) {
#REVERTING bug 3236 and implementing re: bug 6549
- if (/(${IP_ADDRESS}).{10,80}by (\S+) with HTTP/) {
+ if (/(${IP_ADDRESS})\b(?![.-]).{10,80}by (\S+) with HTTP/) {
$ip = $1; $by = $2; goto enough;
}
}