Mailing List Archive

Author: dos
Date: Tue Oct 3 16:21:13 2006
New Revision: 452674

URL: http://svn.apache.org/viewvc?view=rev&rev=452674
Log:
bug 5105: M::SA::Client doesn't always catch failed connection to spamd, fixed

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=452674&r1=452673&r2=452674
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Client.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Client.pm Tue Oct 3 16:21:13 2006
@@ -135,6 +135,7 @@
print $remote "$EOL";

my $line = <$remote>;
+ return undef unless (defined $line);

my ($version, $resp_code, $resp_msg) = $self->_parse_response_line($line);

@@ -242,6 +243,7 @@
print $remote "$EOL";

my $line = <$remote>;
+ return undef unless (defined $line);

my ($version, $resp_code, $resp_msg) = $self->_parse_response_line($line);

@@ -305,6 +307,7 @@
print $remote "$EOL";

my $line = <$remote>;
+ return undef unless (defined $line);

my ($version, $resp_code, $resp_msg) = $self->_parse_response_line($line);

@@ -361,6 +364,7 @@
print $remote "$EOL";

my $line = <$remote>;
+ return undef unless (defined $line);

my ($version, $resp_code, $resp_msg) = $self->_parse_response_line($line);

@@ -409,6 +413,7 @@

my $line = <$remote>;
close $remote;
+ return undef unless (defined $line);

my ($version, $resp_code, $resp_msg) = $self->_parse_response_line($line);
return 0 unless ($resp_msg eq 'PONG');