[memcached] bradfitz, r434: * fix "Warning produced when flu...

commits at code.sixapart.com commits at code.sixapart.com
Mon Nov 20 03:00:05 UTC 2006


        * fix "Warning produced when flush_all called" from CDENT
          http://rt.cpan.org/Public/Bug/Display.html?id=22181



U   trunk/api/perl/ChangeLog
U   trunk/api/perl/lib/Cache/Memcached.pm


Modified: trunk/api/perl/ChangeLog
===================================================================
--- trunk/api/perl/ChangeLog	2006-11-15 18:58:24 UTC (rev 433)
+++ trunk/api/perl/ChangeLog	2006-11-20 03:00:04 UTC (rev 434)
@@ -1,3 +1,6 @@
+        * fix "Warning produced when flush_all called" from CDENT
+	  http://rt.cpan.org/Public/Bug/Display.html?id=22181
+
 	* support access via unix domain sockets. (Nathan Neulinger <nneul at umr.edu>)
 
 	* abstract out response parsing into own class, and add XS-module

Modified: trunk/api/perl/lib/Cache/Memcached.pm
===================================================================
--- trunk/api/perl/lib/Cache/Memcached.pm	2006-11-15 18:58:24 UTC (rev 433)
+++ trunk/api/perl/lib/Cache/Memcached.pm	2006-11-20 03:00:04 UTC (rev 434)
@@ -271,7 +271,7 @@
             my $cb = $self ? $self->{cb_connect_fail} : undef;
             $cb->($host) if $cb;
             return _dead_sock($sock, undef, 20 + int(rand(10)));
-        }    
+        }
     }
 
     # make the new socket not buffer writes.
@@ -776,8 +776,8 @@
     my $line = $cmd;
     while (my $res = _write_and_read($self, $sock, $line)) {
         undef $line;
-    $ret .= $res;
-        last if $ret =~ /(?:END|ERROR)\r\n$/;
+        $ret .= $res;
+        last if $ret =~ /(?:OK|END|ERROR)\r\n$/;
     }
     chop $ret; chop $ret;
     return map { "$_\r\n" } split(/\r\n/, $ret);




More information about the memcached-commits mailing list