Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b566fb4

Browse files
committed
PR #1283. Thanks @fmk!
PHP >=7.3.0 uses zend_string to store `php_url` elements.
1 parent 81f44dc commit b566fb4

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

redis_session.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,11 @@ PS_OPEN_FUNC(redis)
231231
if (url->query != NULL) {
232232
array_init(&params);
233233

234+
#if (PHP_VERSION_ID < 70300)
234235
sapi_module.treat_data(PARSE_STRING, estrdup(url->query), &params TSRMLS_CC);
236+
#else
237+
sapi_module.treat_data(PARSE_STRING, estrndup(ZSTR_VAL(url->query), ZSTR_LEN(url->query)), &params TSRMLS_CC);
238+
#endif
235239

236240
if ((param = zend_hash_str_find(Z_ARRVAL(params), "weight", sizeof("weight") - 1)) != NULL) {
237241
weight = zval_get_long(param);
@@ -276,9 +280,17 @@ PS_OPEN_FUNC(redis)
276280

277281
RedisSock *redis_sock;
278282
if(url->host) {
283+
#if (PHP_VERSION_ID < 70300)
279284
redis_sock = redis_sock_create(url->host, strlen(url->host), url->port, timeout, read_timeout, persistent, persistent_id, retry_interval, 0);
285+
#else
286+
redis_sock = redis_sock_create(ZSTR_VAL(url->host), ZSTR_LEN(url->host), url->port, timeout, read_timeout, persistent, persistent_id, retry_interval, 0);
287+
#endif
280288
} else { /* unix */
289+
#if (PHP_VERSION_ID < 70300)
281290
redis_sock = redis_sock_create(url->path, strlen(url->path), 0, timeout, read_timeout, persistent, persistent_id, retry_interval, 0);
291+
#else
292+
redis_sock = redis_sock_create(ZSTR_VAL(url->path), ZSTR_LEN(url->path), 0, timeout, read_timeout, persistent, persistent_id, retry_interval, 0);
293+
#endif
282294
}
283295
redis_pool_add(pool, redis_sock, weight, database, prefix, auth TSRMLS_CC);
284296

0 commit comments

Comments
 (0)