Mailing List Archive

Author: felicity
Date: Fri Sep 15 16:55:22 2006
New Revision: 446790

URL: http://svn.apache.org/viewvc?view=rev&rev=446790
Log:
bug 5101: fix bug in mbx parsing, also update the MBX_SEPARATOR RE to anchor at start and end of lines, which should make things faster.

Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm?view=diff&rev=446790&r1=446789&r2=446790
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm Fri Sep 15 16:55:22 2006
@@ -849,7 +849,7 @@
}

$self->bump_scan_progress();
- $info->{"$file.$offset"} = Mail::SpamAssassin::Util::receive_date($header);
+ $info->{$offset} = Mail::SpamAssassin::Util::receive_date($header);

# go onto the next message
seek(INPUT, $offset + $size, 0);

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm?view=diff&rev=446790&r1=446789&r2=446790
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm Fri Sep 15 16:55:22 2006
@@ -265,7 +265,7 @@

# regular expression that matches message separators in The University of
# Washington's MBX mailbox format
-use constant MBX_SEPARATOR => qr/([\s|\d]\d-[a-zA-Z]{3}-\d{4}\s\d{2}:\d{2}:\d{2}.*),(\d+);([\da-f]{12})-(\w{8})/;
+use constant MBX_SEPARATOR => qr/^([\s|\d]\d-[a-zA-Z]{3}-\d{4}\s\d{2}:\d{2}:\d{2}.*),(\d+);([\da-f]{12})-(\w{8})\r?$/;
# $1 = datestamp (str)
# $2 = size of message in bytes (int)
# $3 = message status - binary (hex)