diff options
| author | Remi Collet <remi@remirepo.net> | 2020-08-26 15:57:52 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-08-26 15:57:52 +0200 |
| commit | 19f7991bd5abf6e9d197464bf3c393f6016ea782 (patch) | |
| tree | d06174a2b2e99a45a44a85200b4ab2db718b4fd5 /php-upstream.patch | |
| parent | d0e06a3e823c957f4e41e57930aa8999e34da971 (diff) | |
build with upstream fix for zend_call_method
Diffstat (limited to 'php-upstream.patch')
| -rw-r--r-- | php-upstream.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/php-upstream.patch b/php-upstream.patch new file mode 100644 index 0000000..a26c127 --- /dev/null +++ b/php-upstream.patch @@ -0,0 +1,47 @@ +From 55798e0e391d18d7e7d321c1149b12aa89d7d4ff Mon Sep 17 00:00:00 2001 +From: Nikita Popov <nikita.ppv@gmail.com> +Date: Wed, 26 Aug 2020 15:19:23 +0200 +Subject: [PATCH] Lowercase method name in zend_call_method() + +--- + Zend/zend_interfaces.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c +index 16c193e42060..808de7c170da 100644 +--- a/Zend/zend_interfaces.c ++++ b/Zend/zend_interfaces.c +@@ -53,7 +53,7 @@ ZEND_API zval* zend_call_method(zend_object *object, zend_class_entry *obj_ce, z + } + if (!fn_proxy || !*fn_proxy) { + if (EXPECTED(obj_ce)) { +- fn = zend_hash_str_find_ptr( ++ fn = zend_hash_str_find_ptr_lc( + &obj_ce->function_table, function_name, function_name_len); + if (UNEXPECTED(fn == NULL)) { + /* error at c-level */ +From 8c57474e35fa1ae9c256ac224ea646673c9d404c Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@php.net> +Date: Fri, 21 Aug 2020 14:41:35 +0200 +Subject: [PATCH] ensure installed ini don't interfere + +--- + sapi/cli/tests/bug62294.phpt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sapi/cli/tests/bug62294.phpt b/sapi/cli/tests/bug62294.phpt +index b300729939f..04d0d8b60e4 100644 +--- a/sapi/cli/tests/bug62294.phpt ++++ b/sapi/cli/tests/bug62294.phpt +@@ -4,7 +4,7 @@ Bug #62294: register_shutdown_function() does not handle exit code correctly + <?php + + $php = getenv('TEST_PHP_EXECUTABLE'); +-exec($php . ' ' . __DIR__ . '/bug62294.inc', $output, $exit_status); ++exec($php . ' -n ' . __DIR__ . '/bug62294.inc', $output, $exit_status); + var_dump($exit_status); + + ?> +-- +2.11.0 + |