"chomp" DEBUG output - for logging/file

git-svn-id: https://svn.perl.org/qpsmtpd/trunk@956 958fd67b-6ff1-0310-b445-bb7760255be9
smtpd · Nov 4, 2008 · e7bcc3f · e7bcc3f
1 parent 26f6891
commit e7bcc3f
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/plugins/spamassassin b/plugins/spamassassin
@@ -168,6 +168,7 @@ sub hook_data_post { # check_spam
   $self->log(LOGDEBUG, "check_spam: finished sending to spamd");
   my $line0 = <SPAMD>; # get the first protocol lines out
   if ($line0) {
+    $line0 =~ s/\r?\n$//;
     $self->log(LOGDEBUG, "check_spam: spamd: $line0");
 
     $self->_cleanup_spam_header($transaction, 'X-Spam-Check-By');
@@ -178,6 +179,7 @@ sub hook_data_post { # check_spam
 
   my ($flag, $hits, $required);
   while (<SPAMD>) {
+    s/\r?\n$//;
     $self->log(LOGDEBUG, "check_spam: spamd: $_");
     #warn "GOT FROM SPAMD1: $_";
     last unless m/\S/;