Revert "memcached: better error messaging"

This always issues PHP notices when the code is hit.

This reverts commit fe6da52a11375c83d86f73bf4725d14acfbf4cbf

diff --git a/includes/objectcache/MemcachedClient.php b/includes/objectcache/MemcachedClient.php
index eda57c0..ec67a39 100644 (file)
--- a/includes/objectcache/MemcachedClient.php
+++ b/includes/objectcache/MemcachedClient.php
@@ -895,10 +895,7 @@ class MWMemcached {
        function _load_items( $sock, &$ret ) {
                while ( 1 ) {
                        $decl = fgets( $sock );
-                       if( $decl === false ) {
-                               $this->_debugprint( "Error reading socket for a memcached response\n" );
-                               return 0;
-                       } elseif ( $decl == "END\r\n" ) {
+                       if ( $decl == "END\r\n" ) {
                                return true;
                        } elseif ( preg_match( '/^VALUE (\S+) (\d+) (\d+)\r\n$/', $decl, $match ) ) {
                                list( $rkey, $flags, $len ) = array( $match[1], $match[2], $match[3] );
@@ -942,12 +939,7 @@ class MWMemcached {
                                }
 
                        } else {
-                               $peer = $peerAddress = $peerPort = '';
-                               $gotPeer = socket_getpeername( $sock, $peerAddress, $peerPort );
-                               if( $gotPeer ) {
-                                       $peer = " from [$peerAddress:$peerPort";
-                               }
-                               $this->_debugprint( "Error parsing memcached response{$peer}\n" );
+                               $this->_debugprint( "Error parsing memcached response\n" );
                                return 0;
                        }
                }