svn commit: r440475 - /spamassassin/trunk/lib/Mail/SpamAssassin/Client.pm

[fe...@apache.org]

Author: felicity
Date: Tue Sep  5 13:36:14 2006
New Revision: 440475

URL: http://svn.apache.org/viewvc?view=rev&rev=440475
Log:
bug 4825: in M::SA::Client strip the CRLF off the end of the server response line, revert ping code to look for 'PONG' as opposed to an RE

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Client.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Client.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Client.pm?view=diff&rev=440475&r1=440474&r2=440475
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Client.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Client.pm Tue Sep  5 13:36:14 2006
@@ -411,8 +411,7 @@
   close $remote;
 
   my ($version, $resp_code, $resp_msg) = $self->_parse_response_line($line);
-
-  return 0 unless ($resp_msg =~ /^PONG/);
+  return 0 unless ($resp_msg eq 'PONG');
 
   return 1;
 }
@@ -472,6 +471,7 @@
 sub _parse_response_line {
   my ($self, $line) = @_;
 
+  $line =~ s/\r?\n$//;
   return split(/\s+/, $line, 3);
 }