[SACVS] CVS: spamassassin/lib/Mail/SpamAssassin/MIME Parser.pm,1.3,1.4

Update of /cvsroot/spamassassin/spamassassin/lib/Mail/SpamAssassin/MIME
In directory sc8-pr-cvs1:/tmp/cvs-serv7739/lib/Mail/SpamAssassin/MIME

Modified Files:
        Parser.pm 
Log Message:
convert CRLF->LF in decoded MIME parts


Index: Parser.pm
===================================================================
RCS file: 
/cvsroot/spamassassin/spamassassin/lib/Mail/SpamAssassin/MIME/Parser.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -w -u -d -r1.3 -r1.4
--- Parser.pm   24 Sep 2003 21:33:33 -0000      1.3
+++ Parser.pm   24 Sep 2003 22:01:12 -0000      1.4
@@ -375,7 +375,7 @@
   if ( lc( $msg->header('content-transfer-encoding') ) eq 'quoted-printable' ) 
{
     dbg("decoding QP file\n");
     my @output =
-      split ( /^/m, MIME::QuotedPrint::decode_qp( join ( "", @{$body} ) ) );
+      map { s/\r\n/\n/; $_; } split ( /^/m, MIME::QuotedPrint::decode_qp( join 
( "", @{$body} ) ) );
 
     my $type = $msg->header('content-type');
     my ($filename) =
@@ -398,7 +398,7 @@
     }
 
     # If it's a type text or message, split it into an array of lines
-    $output = [ split(/^/m, $output->[0]) ] if ( $type =~ 
m@^(?:text|message)/@ );
+    $output = [ map { s/\r\n/\n/; $_; } split(/^/m, $output->[0]) ] if ( $type 
=~ m@^(?:text|message)/@ );
 
     return $type, $output, $filename;
   }



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf