From: Joe Watkins <krakjoe@php.net>
Date: Wed, 29 May 2019 06:30:55 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0alpha1~166
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc598d1ea93b3accde1ad29e867834ad1485157c;p=php

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
---

cc598d1ea93b3accde1ad29e867834ad1485157c
diff --cc Zend/zend_API.c
index 0dafa9d7db,3d94fd5986..a56231e7c8
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@@ -2774,14 -2847,8 +2774,14 @@@ ZEND_API ZEND_FUNCTION(display_disabled
  ZEND_API int zend_disable_function(char *function_name, size_t function_name_length) /* {{{ */
  {
  	zend_internal_function *func;
 +
 +	if (strcmp(function_name, "eval") == 0) {
 +		zend_compile_string = display_disabled_compile_string;
 +		return SUCCESS;
 +	}
 +
  	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);