diff options
| author | Pavlo Yatsukhnenko <yatsukhnenko@gmail.com> | 2017-04-08 22:56:21 +0300 |
|---|---|---|
| committer | Pavlo Yatsukhnenko <yatsukhnenko@gmail.com> | 2017-04-11 15:22:46 +0300 |
| commit | b56dc49eec94bbb9b0e26aa3d16582c3590029d6 (patch) | |
| tree | a976abcc6f43414095e7e80aa4f18a6738558569 /redis_array.c | |
| parent | d5a2da83b7ce934616c78893fa9bca7dabae6a5e (diff) | |
Processing `read_timeout` parameter + update docs
Diffstat (limited to 'redis_array.c')
| -rw-r--r-- | redis_array.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/redis_array.c b/redis_array.c index 038a7e1a..2cf2303d 100644 --- a/redis_array.c +++ b/redis_array.c @@ -230,7 +230,7 @@ PHP_METHOD(RedisArray, __construct) HashTable *hPrev = NULL, *hOpts = NULL; long l_retry_interval = 0; zend_bool b_lazy_connect = 0; - double d_connect_timeout = 0; + double d_connect_timeout = 0, read_timeout = 0.0; redis_array_object *obj; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|a", &z0, &z_opts) == FAILURE) { @@ -300,6 +300,17 @@ PHP_METHOD(RedisArray, __construct) d_connect_timeout = atof(Z_STRVAL_P(zpData)); } } + + /* extract read_timeout option */ + if ((zpData = zend_hash_str_find(hOpts, "read_timeout", sizeof("read_timeout") - 1)) != NULL) { + if (Z_TYPE_P(zpData) == IS_DOUBLE) { + read_timeout = Z_DVAL_P(zpData); + } else if (Z_TYPE_P(zpData) == IS_LONG) { + read_timeout = Z_LVAL_P(zpData); + } else if (Z_TYPE_P(zpData) == IS_STRING) { + read_timeout = atof(Z_STRVAL_P(zpData)); + } + } } /* extract either name of list of hosts from z0 */ @@ -309,7 +320,7 @@ PHP_METHOD(RedisArray, __construct) break; case IS_ARRAY: - ra = ra_make_array(Z_ARRVAL_P(z0), &z_fun, &z_dist, hPrev, b_index, b_pconnect, l_retry_interval, b_lazy_connect, d_connect_timeout TSRMLS_CC); + ra = ra_make_array(Z_ARRVAL_P(z0), &z_fun, &z_dist, hPrev, b_index, b_pconnect, l_retry_interval, b_lazy_connect, d_connect_timeout, read_timeout TSRMLS_CC); break; default: |