[svn:qpsmtpd] r956 - trunk/plugins

[vetinari]

Author: vetinari
Date: Tue Nov  4 10:37:21 2008
New Revision: 956

Modified:
   trunk/plugins/spamassassin

Log:
"chomp" DEBUG output - for logging/file

Modified: trunk/plugins/spamassassin
==============================================================================
--- trunk/plugins/spamassassin  (original)
+++ trunk/plugins/spamassassin  Tue Nov  4 10:37:21 2008
@@ -168,6 +168,7 @@
   $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 @@
 
   my ($flag, $hits, $required);
   while (<SPAMD>) {
+    s/\r?\n$//;
     $self->log(LOGDEBUG, "check_spam: spamd: $_");
     #warn "GOT FROM SPAMD1: $_";
     last unless m/\S/;