Merge nicolasff:b9a16b5ad5 in, fixing for Win32

Now we should be up to master with upstream for an easier merge.

1 files changed, 1 insertions, 0 deletions

diff --git a/redis_array.h b/redis_array.h
index 3b1163bf..2a8baf44 100644
--- a/redis_array.h
+++ b/redis_array.h
@@ -50,6 +50,7 @@ typedef struct RedisArray_ {
 	zval *z_fun;			/* key extractor, callable */
 	zval *z_dist;			/* key distributor, callable */
 	zval *z_pure_cmds;		/* hash table */
+	double connect_timeout; /* socket connect timeout */
 
 	struct RedisArray_ *prev;
 } RedisArray;