diff options
author | vostok4 <vostok4@gmail.com> | 2014-04-09 13:14:45 +0400 |
---|---|---|
committer | vostok4 <vostok4@gmail.com> | 2014-04-09 13:14:45 +0400 |
commit | 9c12c40a66cbd76f5efa053b1718fa936320400b (patch) | |
tree | 1dc06d47d219fde0b27b5066dd823afd6f349cf5 /redis_array_impl.h | |
parent | 978fbcf6fc355fcd344feb76ab4b7d6b77e9f7c1 (diff) |
Merge nicolasff:b9a16b5ad5 in, fixing for Win32
Now we should be up to master with upstream for an easier merge.
Diffstat (limited to 'redis_array_impl.h')
-rw-r--r-- | redis_array_impl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/redis_array_impl.h b/redis_array_impl.h index 8f106542..06b5332a 100644 --- a/redis_array_impl.h +++ b/redis_array_impl.h @@ -12,7 +12,7 @@ RedisArray *ra_load_hosts(RedisArray *ra, HashTable *hosts, long retry_interval, zend_bool b_lazy_connect TSRMLS_DC); RedisArray *ra_load_array(const char *name TSRMLS_DC); -RedisArray *ra_make_array(HashTable *hosts, zval *z_fun, zval *z_dist, HashTable *hosts_prev, zend_bool b_index, zend_bool b_pconnect, long retry_interval, zend_bool b_lazy_connect TSRMLS_DC); +RedisArray *ra_make_array(HashTable *hosts, zval *z_fun, zval *z_dist, HashTable *hosts_prev, zend_bool b_index, zend_bool b_pconnect, long retry_interval, zend_bool b_lazy_connect, double connect_timeout TSRMLS_DC); zval *ra_find_node_by_name(RedisArray *ra, const char *host, int host_len TSRMLS_DC); zval *ra_find_node(RedisArray *ra, const char *key, int key_len, int *out_pos TSRMLS_DC); void ra_init_function_table(RedisArray *ra); |