com php-src: Merge branch 'PHP-5.6': Zend/zend_API.c
| From: | Xinchen Hui | Date: | Fri, 31 Oct 2014 09:37:56 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': Zend/zend_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82914@lists.php.net to get a copy of this message | ||
Commit: ccb09eb352ab440f61e8dbf43787f96503a008dc
Author: Xinchen Hui <laruence@php.net> Fri, 31 Oct 2014 17:37:56 +0800
Parents: 84783ecb7ea76e88a3831b5dae3e3819347bfbcc d017c4bf3ae8c49340b56f9ab1d31d2793f65489
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ccb09eb352ab440f61e8dbf43787f96503a008dc
Log:
Merge branch 'PHP-5.6'
Conflicts:
Zend/zend_API.c
Changed paths:
MM Zend/zend_API.c
Diff:
diff --cc Zend/zend_API.c
index c6b34e0,a465721..3643bfc
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@@ -2754,21 -2635,15 +2754,15 @@@ ZEND_API ZEND_FUNCTION(display_disabled
}
/* }}} */
- static zend_function_entry disabled_function[] = {
- ZEND_FE(display_disabled_function, NULL)
- ZEND_FE_END
- };
-
-ZEND_API int zend_disable_function(char *function_name, uint function_name_length TSRMLS_DC) /*
{{{ */
+ZEND_API int zend_disable_function(char *function_name, size_t function_name_length TSRMLS_DC) /*
{{{ */
{
- int ret;
-
- ret = zend_hash_str_del(CG(function_table), function_name, function_name_length);
- if (ret == FAILURE) {
- return FAILURE;
+ zend_internal_function *func;
- if (zend_hash_find(CG(function_table), function_name, function_name_length+1, (void
**)&func)==SUCCESS) {
++ if ((func = zend_hash_str_find_ptr(CG(function_table), function_name, function_name_length))) {
+ func->arg_info = NULL;
+ func->handler = ZEND_FN(display_disabled_function);
+ return SUCCESS;
}
- disabled_function[0].fname = function_name;
- return zend_register_functions(NULL, disabled_function, CG(function_table), MODULE_PERSISTENT
TSRMLS_CC);
+ return FAILURE;
}
/* }}} */