Skip to content

Commit 9f94566

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: disabled functions must not have return type Restore the execute bit for run-tests.php
2 parents 37d01ff + cc598d1 commit 9f94566

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Zend/zend_API.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2666,7 +2666,7 @@ ZEND_API int zend_disable_function(char *function_name, size_t function_name_len
26662666
}
26672667

26682668
if ((func = zend_hash_str_find_ptr(CG(function_table), function_name, function_name_length))) {
2669-
func->fn_flags &= ~(ZEND_ACC_VARIADIC | ZEND_ACC_HAS_TYPE_HINTS);
2669+
func->fn_flags &= ~(ZEND_ACC_VARIADIC | ZEND_ACC_HAS_TYPE_HINTS | ZEND_ACC_HAS_RETURN_TYPE);
26702670
func->num_args = 0;
26712671
func->arg_info = NULL;
26722672
func->handler = ZEND_FN(display_disabled_function);

0 commit comments

Comments
 (0)