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

Skip to content

Issue #504 #1032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 24, 2016
Merged

Issue #504 #1032

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions redis.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,11 +431,8 @@ static void redis_destructor_redis_sock(zend_resource * rsrc TSRMLS_DC)
redis_free_socket(redis_sock);
}

/**
* redis_sock_get
*/
PHP_REDIS_API int redis_sock_get(zval *id, RedisSock **redis_sock TSRMLS_DC,
int no_throw)
static zend_always_inline int
redis_sock_get_instance(zval *id, RedisSock **redis_sock TSRMLS_DC, int no_throw)
{
zval *socket;

Expand Down Expand Up @@ -466,6 +463,19 @@ PHP_REDIS_API int redis_sock_get(zval *id, RedisSock **redis_sock TSRMLS_DC,
}
return -1;
}
return 0;
}

/**
* redis_sock_get
*/
PHP_REDIS_API int
redis_sock_get(zval *id, RedisSock **redis_sock TSRMLS_DC, int no_throw)
{
if (redis_sock_get_instance(id, redis_sock TSRMLS_CC, no_throw) < 0) {
return -1;
}

if ((*redis_sock)->lazy_connect)
{
(*redis_sock)->lazy_connect = 0;
Expand Down Expand Up @@ -2670,7 +2680,7 @@ PHP_METHOD(Redis, object)
PHP_METHOD(Redis, getOption) {
RedisSock *redis_sock;

if (redis_sock_get(getThis(), &redis_sock TSRMLS_CC, 0) < 0) {
if (redis_sock_get_instance(getThis(), &redis_sock TSRMLS_CC, 0) < 0) {
RETURN_FALSE;
}

Expand All @@ -2683,7 +2693,7 @@ PHP_METHOD(Redis, getOption) {
PHP_METHOD(Redis, setOption) {
RedisSock *redis_sock;

if(redis_sock_get(getThis(), &redis_sock TSRMLS_CC, 0)<0) {
if (redis_sock_get_instance(getThis(), &redis_sock TSRMLS_CC, 0) < 0) {
RETURN_FALSE;
}

Expand Down