diff options
| author | Andrew Sharpe <asharpe@squiz.net> | 2017-12-24 10:15:14 +0300 |
|---|---|---|
| committer | Andrew Sharpe <asharpe@squiz.net> | 2017-12-24 10:15:14 +0300 |
| commit | 02f4bd318bd9f39b11fb1af07a96fbe5a8591884 (patch) | |
| tree | 5a067241c2c8fd8443f972d70549f3a386320779 /redis_session.c | |
| parent | eb435546d89c4fdebd578a69a69a9001ac254f9b (diff) | |
declare sid in the right scope
Diffstat (limited to 'redis_session.c')
| -rw-r--r-- | redis_session.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/redis_session.c b/redis_session.c index 4ce3a92e..e67a1690 100644 --- a/redis_session.c +++ b/redis_session.c @@ -586,15 +586,20 @@ redis_session_key(redis_pool_member *rpm, const char *key, int key_len, int *ses PS_CREATE_SID_FUNC(redis) { int retries = 3; +#if (PHP_MAJOR_VERSION < 7) + char *sid; +#else + zend_string *sid; +#endif redis_pool *pool = PS_GET_MOD_DATA(); while (retries-- > 0) { #if (PHP_MAJOR_VERSION < 7) - char *sid = php_session_create_id((void **) &pool, newlen TSRMLS_CC); + sid = php_session_create_id((void **) &pool, newlen TSRMLS_CC); redis_pool_member *rpm = redis_pool_get_sock(pool, sid TSRMLS_CC); #else - zend_string *sid = php_session_create_id((void **) &pool TSRMLS_CC); + sid = php_session_create_id((void **) &pool TSRMLS_CC); redis_pool_member *rpm = redis_pool_get_sock(pool, ZSTR_VAL(sid) TSRMLS_CC); #endif RedisSock *redis_sock = rpm?rpm->redis_sock:NULL; |