From 16ff984479005d625b989b30283cc48cba695f27 Mon Sep 17 00:00:00 2001
From: moyo <moyo@uuland.org>
Date: Fri, 12 Jun 2015 14:33:07 +0800
Subject: [PATCH] fix the Connection read might cause incomplete data
 extracting

---
 src/nsqphp/Connection/Connection.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/nsqphp/Connection/Connection.php b/src/nsqphp/Connection/Connection.php
index 6a49e6d..48517c6 100644
--- a/src/nsqphp/Connection/Connection.php
+++ b/src/nsqphp/Connection/Connection.php
@@ -136,31 +136,32 @@ public function isReadable()
     /**
      * Read from the socket exactly $len bytes
      *
-     * @param integer $len How many bytes to read
+     * @param integer $desiredLen How many bytes to read
      * 
      * @return string Binary data
     */
-    public function read($len)
+    public function read($desiredLen)
     {
         $null = NULL;
         $read = array($socket = $this->getSocket());
+        $surplusLen = $desiredLen;
         $buffer = $data = '';
-        while (strlen($data) < $len) {
+        while (strlen($data) < $desiredLen) {
             $readable = stream_select($read, $null, $null, $this->readWriteTimeoutSec, $this->readWriteTimeoutUsec);
             if ($readable > 0) {
-                $buffer = @stream_socket_recvfrom($socket, $len);
+                $buffer = @stream_socket_recvfrom($socket, $surplusLen);
                 if ($buffer === FALSE) {
-                    throw new SocketException("Could not read {$len} bytes from {$this->hostname}:{$this->port}");
+                    throw new SocketException("Could not read {$surplusLen} bytes from {$this->hostname}:{$this->port}");
                 } else if ($buffer == '') {
                     throw new SocketException("Read 0 bytes from {$this->hostname}:{$this->port}");
                 }
             } else if ($readable === 0) {
-                throw new SocketException("Timed out reading {$len} bytes from {$this->hostname}:{$this->port} after {$this->readWriteTimeoutSec} seconds and {$this->readWriteTimeoutUsec} microseconds");
+                throw new SocketException("Timed out reading {$surplusLen} bytes from {$this->hostname}:{$this->port} after {$this->readWriteTimeoutSec} seconds and {$this->readWriteTimeoutUsec} microseconds");
             } else {
-                throw new SocketException("Could not read {$len} bytes from {$this->hostname}:{$this->port}");
+                throw new SocketException("Could not read {$surplusLen} bytes from {$this->hostname}:{$this->port}");
             }
             $data .= $buffer;
-            $len -= strlen($buffer);
+            $surplusLen -= strlen($buffer);
         }
         return $data;
     }