diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-05-29 08:30:55 +0200 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-05-29 08:30:55 +0200 |
| commit | cc598d1ea93b3accde1ad29e867834ad1485157c (patch) | |
| tree | c64ba18c1a2b9df3eecedd5cbd22d5c47c16ab4c /Zend/zend_API.c | |
| parent | 08a0030b33a46849ddda8bd962a6b05db0750c4a (diff) | |
| parent | 6c73b2088a020e9a3deed3bb3b051be6bd998203 (diff) | |
| download | php-git-cc598d1ea93b3accde1ad29e867834ad1485157c.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
disabled functions must not have return type
Restore the execute bit for run-tests.php
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 0dafa9d7db..a56231e7c8 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2781,7 +2781,7 @@ ZEND_API int zend_disable_function(char *function_name, size_t function_name_len } 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); |