From 7bef3abf9119fc16b593fa98dbf779b83769b4ab Mon Sep 17 00:00:00 2001
From: Daniele Alessandri <suppakilla@gmail.com>
Date: Sun, 6 Mar 2011 09:55:22 +0100
Subject: [PATCH] Change the code for the initialization of the phpiredis
 reader resource.

---
 lib/Predis/Network/PhpiredisConnection.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/lib/Predis/Network/PhpiredisConnection.php b/lib/Predis/Network/PhpiredisConnection.php
index be34cfbd..ca9c7772 100644
--- a/lib/Predis/Network/PhpiredisConnection.php
+++ b/lib/Predis/Network/PhpiredisConnection.php
@@ -26,7 +26,7 @@ use Predis\ConnectionParameters;
 use Predis\Commands\ICommand;
 
 class PhpiredisConnection extends ConnectionBase {
-    private $_reader, $_throwErrors;
+    private $_reader;
 
     public function __construct(ConnectionParameters $parameters) {
         if (!function_exists('socket_create')) {
@@ -36,8 +36,7 @@ class PhpiredisConnection extends ConnectionBase {
             );
         }
         parent::__construct($this->checkParameters($parameters));
-        $this->_throwErrors = true;
-        $this->initializeReader();
+        $this->_reader = $this->initializeReader();
     }
 
     public function __destruct() {
@@ -74,9 +73,10 @@ class PhpiredisConnection extends ConnectionBase {
                 'use this connection class'
             );
         }
-        $this->_reader = phpiredis_reader_create();
-        phpiredis_reader_set_status_handler($this->_reader, $this->getStatusHandler());
-        phpiredis_reader_set_error_handler($this->_reader, $this->getErrorHandler());
+        $reader = phpiredis_reader_create();
+        phpiredis_reader_set_status_handler($reader, $this->getStatusHandler());
+        phpiredis_reader_set_error_handler($reader, $this->getErrorHandler(true));
+        return $reader;
     }
 
     private function getStatusHandler() {
@@ -92,8 +92,8 @@ class PhpiredisConnection extends ConnectionBase {
         };
     }
 
-    private function getErrorHandler() {
-        if ($this->_throwErrors) {
+    private function getErrorHandler($throwErrors) {
+        if ($throwErrors) {
             return function($errorMessage) {
                 throw new ServerException(substr($errorMessage, 4));
             };
@@ -264,8 +264,10 @@ class PhpiredisConnection extends ConnectionBase {
                 // TODO: iterable multibulk replies cannot be supported
                 break;
             case 'throw_errors':
-                $this->_throwErrors = (bool) $value;
-                phpiredis_reader_set_error_handler($this->_reader, $this->getErrorHandler());
+                phpiredis_reader_set_error_handler(
+                    $this->_reader,
+                    $this->getErrorHandler((bool) $value)
+                );
                 break;
         }
     }