diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-05-29 08:30:41 +0200 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-05-29 08:30:41 +0200 |
| commit | 6c73b2088a020e9a3deed3bb3b051be6bd998203 (patch) | |
| tree | 193e2312ab3304d518c975656e5033bddfc78c99 /Zend/zend_API.c | |
| parent | 72c330f1e6000e6b52f92c13c42bf9c620c20ddf (diff) | |
| parent | 7821cc3b9f51d12f2cf391e191fef1f591cb7f35 (diff) | |
| download | php-git-6c73b2088a020e9a3deed3bb3b051be6bd998203.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
disabled functions must not have return type
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 43c12f4f2c..3d94fd5986 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2848,7 +2848,7 @@ ZEND_API int zend_disable_function(char *function_name, size_t function_name_len { zend_internal_function *func; if ((func = zend_hash_str_find_ptr(CG(function_table), function_name, function_name_length))) { - func->fn_flags &= ~(ZEND_ACC_VARIADIC | ZEND_ACC_HAS_TYPE_HINTS); + func->fn_flags &= ~(ZEND_ACC_VARIADIC | ZEND_ACC_HAS_TYPE_HINTS | ZEND_ACC_HAS_RETURN_TYPE); func->num_args = 0; func->arg_info = NULL; func->handler = ZEND_FN(display_disabled_function); |