You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2006/05/02 05:33:15 UTC
svn commit: r398790 -
/spamassassin/branches/3.1/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
Author: felicity
Date: Mon May 1 20:33:13 2006
New Revision: 398790
URL: http://svn.apache.org/viewcvs?rev=398790&view=rev
Log:
bug 4867: fetchmail changed header formats at some point making Received parsing fail in certain conditions
Modified:
spamassassin/branches/3.1/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
Modified: spamassassin/branches/3.1/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
URL: http://svn.apache.org/viewcvs/spamassassin/branches/3.1/lib/Mail/SpamAssassin/Message/Metadata/Received.pm?rev=398790&r1=398789&r2=398790&view=diff
==============================================================================
--- spamassassin/branches/3.1/lib/Mail/SpamAssassin/Message/Metadata/Received.pm (original)
+++ spamassassin/branches/3.1/lib/Mail/SpamAssassin/Message/Metadata/Received.pm Mon May 1 20:33:13 2006
@@ -734,7 +734,7 @@
# Received: from cabbage.jmason.org [127.0.0.1]
# by localhost with IMAP (fetchmail-5.9.0)
# for jm@localhost (single-drop); Thu, 13 Mar 2003 20:39:56 -0800 (PST)
- if (/^from (\S+) \[(${IP_ADDRESS})\] by (\S+) with \S+ \(fetchmail/) {
+ if (/^from (\S+) (?:\[(${IP_ADDRESS})\] )?by (\S+) with \S+ \(fetchmail/) {
$self->found_pop_fetcher_sig();
return; # skip fetchmail handovers
}