You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2004/09/05 05:20:10 UTC
svn commit: rev 43361 - spamassassin/trunk/lib/Mail/SpamAssassin
Author: felicity
Date: Sat Sep 4 20:20:09 2004
New Revision: 43361
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm
Log:
bug 3748: when subparsing a message/* type, if the part was empty, Message-new() would wait for STDIN input. now only do a subparse if the part actually has decoded data in it.
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm Sat Sep 4 20:20:09 2004
@@ -560,9 +560,10 @@
if ($part_msg->{'type'} =~ /^message\b/i) {
# Get the part ready...
my $message = $part_msg->decode();
- my $msg_obj = Mail::SpamAssassin::Message->new({message=>$message, parsenow=>1});
if ($message) {
+ my $msg_obj = Mail::SpamAssassin::Message->new({message=>$message, parsenow=>1});
+
# main message is a message/* part ...
if ($msg == $part_msg) {
$msg->add_body_part($msg_obj);
@@ -575,9 +576,9 @@
$part_msg->add_body_part($msg_obj);
}
- }
- return;
+ return;
+ }
}
# Add the new part as a child to the parent