Merge branch 'master' of github.com:swoole/swoole-src

matyhtf · matyhtf · commit e9d3d01d39dd · 2016-02-02T16:21:02.000+08:00
diff --git a/swoole_redis.c b/swoole_redis.c
@@ -634,7 +634,7 @@ static void swoole_redis_event_Cleanup(void *privdata)
         zval **args[1];
         args[0] = &redis->object;
 
-        if (sw_call_user_function_ex(EG(function_table), NULL, redis->connect_callback, &retval, 2, args, 0, NULL TSRMLS_CC) != SUCCESS)
+        if (sw_call_user_function_ex(EG(function_table), NULL, redis->connect_callback, &retval, 1, args, 0, NULL TSRMLS_CC) != SUCCESS)
         {
             swoole_php_fatal_error(E_WARNING, "swoole_async_mysql callback handler error.");
         }

Original file line number	Diff line number	Diff line change
`@@ -634,7 +634,7 @@ static void swoole_redis_event_Cleanup(void *privdata)`
`634`	`634`	`zval **args[1];`
`635`	`635`	`args[0] = &redis->object;`
`636`	`636`
`637`		`- if (sw_call_user_function_ex(EG(function_table), NULL, redis->connect_callback, &retval, 2, args, 0, NULL TSRMLS_CC) != SUCCESS)`
	`637`	`+ if (sw_call_user_function_ex(EG(function_table), NULL, redis->connect_callback, &retval, 1, args, 0, NULL TSRMLS_CC) != SUCCESS)`
`638`	`638`	`{`
`639`	`639`	`swoole_php_fatal_error(E_WARNING, "swoole_async_mysql callback handler error.");`
`640`	`640`	`}`