From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 13 Mar 2013 21:28:06 +0000 (-0700)
Subject: Allow having no serializer in RedisConnectionPool.
X-Git-Tag: 1.31.0-rc.0~20350
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=a646351d83a751f13c5f6c2c58c190e4688e1882;p=lhc%2Fweb%2Fwiklou.git

Allow having no serializer in RedisConnectionPool.

Change-Id: If367c26b6b19374d1445c406851e2c5d3e5cc634
---

diff --git a/includes/clientpool/RedisConnectionPool.php b/includes/clientpool/RedisConnectionPool.php
index 2d6df0ecf6..5c7c4f20b5 100644
--- a/includes/clientpool/RedisConnectionPool.php
+++ b/includes/clientpool/RedisConnectionPool.php
@@ -62,7 +62,7 @@ class RedisConnectionPool {
 	 *                      multiple web requests. False by default.
 	 *   - password       : The authentication password, will be sent to Redis in clear text.
 	 *                      Optional, if it is unspecified, no AUTH command will be sent.
-	 *   - serializer     : Set to "php" or "igbinary". Default is "php".
+	 *   - serializer     : Set to "php", "igbinary", or "none". Default is "php".
 	 * @param array $options
 	 */
 	protected function __construct( array $options ) {
@@ -77,6 +77,8 @@ class RedisConnectionPool {
 			$this->serializer = Redis::SERIALIZER_PHP;
 		} elseif ( $options['serializer'] === 'igbinary' ) {
 			$this->serializer = Redis::SERIALIZER_IGBINARY;
+		} elseif ( $options['serializer'] === 'none' ) {
+			$this->serializer = Redis::SERIALIZER_NONE;
 		} else {
 			throw new MWException( "Invalid serializer specified." );
 		}