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 2009/11/03 21:03:10 UTC
svn commit: r832530 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm
Author: mmartinec
Date: Tue Nov 3 20:03:10 2009
New Revision: 832530
URL: http://svn.apache.org/viewvc?rev=832530&view=rev
Log:
Plugin::SPF incorrectly insisted on a space after colon in a Received-SPF header field
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm?rev=832530&r1=832529&r2=832530&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm Tue Nov 3 20:03:10 2009
@@ -317,7 +317,7 @@
}
foreach my $hdr (@internal_hdrs) {
- if ($hdr =~ /^received-spf: /i) {
+ if ($hdr =~ /^received-spf:/i) {
dbg("spf: found a Received-SPF header added by an internal host: $hdr");
# old version:
@@ -336,7 +336,7 @@
# http://www.openspf.org/RFC_4408#header-field
# wtf - for some reason something is sticking an extra space between the header name and field value
- if ($hdr =~ /^received-spf:\s+(pass|neutral|(?:soft)?fail|none)\b(?:.*\bidentity=(\S+?);?\b)?/i) {
+ if ($hdr =~ /^received-spf:\s*(pass|neutral|(?:soft)?fail|none)\b(?:.*\bidentity=(\S+?);?\b)?/i) {
my $result = lc($1);
my $identity = ''; # we assume it's a mfrom check if we can't tell otherwise