archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.3' into PHP-7.4

Browse source 
* PHP-7.3:
  disabled functions must not have return type
  Restore the execute bit for run-tests.php
This commit is contained in:
Joe Watkins 2019-05-29 08:30:55 +02:00
commit cc598d1ea9
No known key found for this signature in database
GPG key ID: F9BA0ADA31CBD89E
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/zend_API.c
View file

@ -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))) { 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->num_args = 0;
func->arg_info = NULL; func->arg_info = NULL;
func->handler = ZEND_FN(display_disabled_function); func->handler = ZEND_FN(display_disabled_function);