Skip to content

Commit cc598d1

Browse files
committed
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
2 parents 08a0030 + 6c73b20 commit cc598d1

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
@@ -2781,7 +2781,7 @@ ZEND_API int zend_disable_function(char *function_name, size_t function_name_len
27812781
}
27822782

27832783
if ((func = zend_hash_str_find_ptr(CG(function_table), function_name, function_name_length))) {
2784-
func->fn_flags &= ~(ZEND_ACC_VARIADIC | ZEND_ACC_HAS_TYPE_HINTS);
2784+
func->fn_flags &= ~(ZEND_ACC_VARIADIC | ZEND_ACC_HAS_TYPE_HINTS | ZEND_ACC_HAS_RETURN_TYPE);
27852785
func->num_args = 0;
27862786
func->arg_info = NULL;
27872787
func->handler = ZEND_FN(display_disabled_function);

0 commit comments

Comments
 (0)