From 72c330f1e6000e6b52f92c13c42bf9c620c20ddf Mon Sep 17 00:00:00 2001 From: Craig Duncan Date: Tue, 28 May 2019 21:51:26 +0100 Subject: [PATCH 1/2] Restore the execute bit for run-tests.php It looks like this was accidentally removed in 03f15f705ad30ce2dde7f7b2ab087a132b859ba0 --- run-tests.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 run-tests.php diff --git a/run-tests.php b/run-tests.php old mode 100644 new mode 100755 From 7821cc3b9f51d12f2cf391e191fef1f591cb7f35 Mon Sep 17 00:00:00 2001 From: Joe Watkins Date: Wed, 29 May 2019 08:30:08 +0200 Subject: [PATCH 2/2] disabled functions must not have return type --- Zend/zend_API.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zend/zend_API.c b/Zend/zend_API.c index d4b1502734f..604450e9279 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2837,7 +2837,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);