summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2014-10-31 17:37:56 +0800
committerXinchen Hui <laruence@php.net>2014-10-31 17:37:56 +0800
commitccb09eb352ab440f61e8dbf43787f96503a008dc (patch)
tree13c35b8c30e65e15c5733c618aa1894aceceb283 /Zend
parent84783ecb7ea76e88a3831b5dae3e3819347bfbcc (diff)
parentd017c4bf3ae8c49340b56f9ab1d31d2793f65489 (diff)
downloadphp-git-ccb09eb352ab440f61e8dbf43787f96503a008dc.tar.gz
Merge branch 'PHP-5.6'
Conflicts: Zend/zend_API.c
Diffstat (limited to 'Zend')
-rw-r--r--Zend/zend_API.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index c6b34e03f1..3643bfc8e2 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2754,21 +2754,15 @@ ZEND_API ZEND_FUNCTION(display_disabled_function)
}
/* }}} */
-static zend_function_entry disabled_function[] = {
- ZEND_FE(display_disabled_function, NULL)
- ZEND_FE_END
-};
-
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 ((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;
}
/* }}} */