Author: sidney
Date: Sun Nov 13 04:14:48 2005
New Revision: 332970
URL: http://svn.apache.org/viewcvs?rev=332970&view=rev
Log:
bug 4439 Fix removal of markup when there are DOS newlines
Modified:
spamassassin/branches/3.0/lib/Mail/SpamAssassin.pm
Modified: spamassassin/branches/3.0/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewcvs/spamassassin/branches/3.0/lib/Mail/SpamAssassin.pm?rev=332970&r1=332969&r2=332970&view=diff
==============================================================================
--- spamassassin/branches/3.0/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/branches/3.0/lib/Mail/SpamAssassin.pm Sun Nov 13 04:14:48 2005
@@ -862,7 +862,7 @@
my $cd = '';
for ( my $i = 0 ; $i <= $#msg ; $i++ ) {
# only look at mime part headers
- next unless ( $msg[$i] =~ /^--$boundary$/ || $flag );
+ next unless ( $msg[$i] =~ /^--$boundary\r?$/ || $flag );
if ( $msg[$i] =~ /^\s*$/ ) { # end of mime header
Date: Sun Nov 13 04:14:48 2005
New Revision: 332970
URL: http://svn.apache.org/viewcvs?rev=332970&view=rev
Log:
bug 4439 Fix removal of markup when there are DOS newlines
Modified:
spamassassin/branches/3.0/lib/Mail/SpamAssassin.pm
Modified: spamassassin/branches/3.0/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewcvs/spamassassin/branches/3.0/lib/Mail/SpamAssassin.pm?rev=332970&r1=332969&r2=332970&view=diff
==============================================================================
--- spamassassin/branches/3.0/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/branches/3.0/lib/Mail/SpamAssassin.pm Sun Nov 13 04:14:48 2005
@@ -862,7 +862,7 @@
my $cd = '';
for ( my $i = 0 ; $i <= $#msg ; $i++ ) {
# only look at mime part headers
- next unless ( $msg[$i] =~ /^--$boundary$/ || $flag );
+ next unless ( $msg[$i] =~ /^--$boundary\r?$/ || $flag );
if ( $msg[$i] =~ /^\s*$/ ) { # end of mime header