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 2011/10/29 04:40:39 UTC
svn commit: r1190742 -
/spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm
Author: kmcgrail
Date: Sat Oct 29 02:40:39 2011
New Revision: 1190742
URL: http://svn.apache.org/viewvc?rev=1190742&view=rev
Log:
extension of From: boundary check for Communigate Pro Bug 6413
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm?rev=1190742&r1=1190741&r2=1190742&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm Sat Oct 29 02:40:39 2011
@@ -396,7 +396,8 @@ sub _run_mailbox {
}
seek(INPUT,$offset,0) or die "cannot reposition file to $offset: $!";
for ($!=0; <INPUT>; $!=0) {
- last if (substr($_,0,5) eq "From " && @msg && /^From \S+ ?\S\S\S \S\S\S .\d .\d:\d\d:\d\d \d{4}/);
+ #Changed Regex to include boundaries for Communigate Pro versions (5.2.x and later). per Bug 6413
+ last if (substr($_,0,5) eq "From " && @msg && /^From \S+ ?(\S\S\S \S\S\S .\d .\d:\d\d:\d\d \d{4}|.\d-\d\d-\d{4}_\d\d:\d\d:\d\d_)/);
push (@msg, $_);
# skip too-big mails
@@ -908,8 +909,9 @@ sub _scan_mailbox {
$header .= $_;
}
}
+ #Changed Regex to include boundaries for Communigate Pro versions (5.2.x and later). per Bug 6413
if (substr($_,0,5) eq "From " &&
- /^From \S+ ?\S\S\S \S\S\S .\d .\d:\d\d:\d\d \d{4}/) {
+ /^From \S+ ?(\S\S\S \S\S\S .\d .\d:\d\d:\d\d \d{4}|.\d-\d\d-\d{4}_\d\d:\d\d:\d\d_)/) {
$in_header = 1;
$first = $_;
$start = $where;