Merge with upstream

Author: char101

README.markdown

@@ -71,6 +71,11 @@ By default and in order to be compatible with other libraries, phpredis will try
 For instance, the keys “{user:1}:name” and “{user:1}:email” will be stored on the same server as only “user:1” will be hashed. You can provide a custom function name in your redis array with the "function" option; this function will be called every time a key needs to be hashed. It should take a string and return a string.
 
 
+## Custom key distribution function
+In order to control the distribution of keys by hand, you can provide a custom function or closure that returns the server number, which is the index in the array of servers that you created the RedisArray object with.
+
+For instance, instanciate a RedisArray object with `new RedisArray(array("us-host", "uk-host", "de-host"), array("distributor" => "dist"));` and write a function called "dist" that will return `2` for all the keys that should end up on the "de-host" server.
+
 ## Migrating keys
 
 When a node is added or removed from a ring, RedisArray instances must be instanciated with a “previous” list of nodes. A single call to `$ra->_rehash()` causes all the keys to be redistributed according to the new list of nodes. Passing a callback function to `_rehash()` makes it possible to track the progress of that operation: the function is called with a node name and a number of keys that will be examined, e.g. `_rehash(function ($host, $count){ ... });`.

arrays.markdown

@@ -1,5 +1,6 @@
 #include "php.h"
 #include "php_ini.h"
+#include <ext/standard/php_smart_str.h>
 
 #ifndef REDIS_COMMON_H
 #define REDIS_COMMON_H
@@ -40,6 +41,7 @@ typedef enum _REDIS_REPLY_TYPE {
 /* options */
 #define REDIS_OPT_SERIALIZER		1
 #define REDIS_OPT_PREFIX		    2
+#define REDIS_OPT_READ_TIMEOUT		3
 
 /* serializers */
 #define REDIS_SERIALIZER_NONE		0
@@ -161,7 +163,10 @@ typedef struct {
     php_stream     *stream;
     char           *host;
     short          port;
+    char           *auth;
     double         timeout;
+    double         read_timeout;
+    long           retry_interval;
     int            failed;
     int            status;
     int            persistent;

common.h

@@ -49,10 +49,12 @@ dnl Check for igbinary
     AC_MSG_RESULT([enabled])
     AC_DEFINE(HAVE_REDIS_IGBINARY,1,[Whether redis igbinary serializer is enabled])
     IGBINARY_INCLUDES="-I$igbinary_inc_path"
+    IGBINARY_EXT_DIR="$igbinary_inc_path/ext"
     ifdef([PHP_ADD_EXTENSION_DEP],
     [
       PHP_ADD_EXTENSION_DEP(redis, igbinary)
     ])
+    PHP_ADD_INCLUDE($IGBINARY_EXT_DIR)
   else
     IGBINARY_INCLUDES=""
     AC_MSG_RESULT([disabled])

config.m4

@@ -1,5 +1,5 @@
 Package: phpredis
-Version: 1.0
+Version: 2.2.2
 Section: web 
 Priority: optional
 Architecture: all

debian.control

@@ -1,3 +1,10 @@
+php5-redis (2.2.2-1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Updating version from upstream
+
+ -- Rémi Paulmier <remi.paulmier@gmail.com>  Fri, 02 Nov 2012 10:30:28 +0100
+
 php5-redis (2.1.3-1) unstable; urgency=low
 
   * Non-maintainer upload.

debian/changelog

@@ -10,4 +10,7 @@ Package: php5-redis
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${php5:Depends}
 Recommends: php5
+Provides: php5-redis
+Conflicts: phpredis
+Replaces: phpredis
 Description: Redis C extension for PHP5.