Reverting some obsoleted changes in preparation for a merge into the master branch.

This commit is contained in:
Daniele Alessandri
2010-03-09 14:47:15 +01:00
parent 6e5c495b26
commit d8b0c7f40c
+2 -18
View File
@@ -85,10 +85,6 @@ class Client {
return $this->_serverProfile;
}
public function useMultiBulkIterator($value = true) {
Response::useMultiBulkIterator($value);
}
public function connect() {
$this->_connection->connect();
}
@@ -370,7 +366,7 @@ class Response {
const QUEUED = 'QUEUED';
const NULL = 'nil';
private static $_prefixHandlers, $_useMultiBulkIterator;
private static $_prefixHandlers;
private static function initializePrefixHandlers() {
return array(
@@ -378,22 +374,10 @@ class Response {
'-' => new ResponseErrorHandler(),
':' => new ResponseIntegerHandler(),
'$' => new ResponseBulkHandler(),
'*' => self::$_useMultiBulkIterator
? new ResponseMultiBulkStreamHandler()
: new ResponseMultiBulkHandler()
'*' => new ResponseMultiBulkHandler(),
);
}
public static function useMultiBulkIterator($value = null) {
if (is_bool($value)) {
self::$_useMultiBulkIterator = $value;
self::$_prefixHandlers = self::initializePrefixHandlers();
}
else {
return self::$_useMultiBulkIterator;
}
}
public static function read($socket) {
$header = fgets($socket);
if ($header === false) {