From 345ea47467e6fcf56ec9aa3d259f514cc7ee2726 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 27 Nov 2020 07:09:55 +0100 Subject: update to 4.5.9 --- 9ab8f1dfd8889f9e8581452c1ecde11cbb702280.patch | 30 -------------------------- 1 file changed, 30 deletions(-) delete mode 100644 9ab8f1dfd8889f9e8581452c1ecde11cbb702280.patch (limited to '9ab8f1dfd8889f9e8581452c1ecde11cbb702280.patch') diff --git a/9ab8f1dfd8889f9e8581452c1ecde11cbb702280.patch b/9ab8f1dfd8889f9e8581452c1ecde11cbb702280.patch deleted file mode 100644 index e830498..0000000 --- a/9ab8f1dfd8889f9e8581452c1ecde11cbb702280.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9ab8f1dfd8889f9e8581452c1ecde11cbb702280 Mon Sep 17 00:00:00 2001 -From: twosee -Date: Sun, 22 Nov 2020 17:42:41 +0800 -Subject: [PATCH] Fix sw_zend_is_callable_at_frame() (#3868) - -* Fix sw_zend_is_callable_at_frame() - -* Require PHP 8.0.1 ---- - ext-src/php_swoole.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/ext-src/php_swoole.h b/ext-src/php_swoole.h -index ff32a2cccb..96fc4c9b6b 100644 ---- a/ext-src/php_swoole.h -+++ b/ext-src/php_swoole.h -@@ -912,10 +912,11 @@ static sw_inline zend_bool sw_zend_is_callable_at_frame(zval *zcallable, zval *z - { - zend_string *name; - zend_bool ret; --#if PHP_VERSION_ID < 80000 -+#if PHP_VERSION_ID < 80001 - ret = zend_is_callable_ex(zcallable, zobject ? Z_OBJ_P(zobject) : NULL, check_flags, &name, fci_cache, error); - #else -- ret = zend_is_callable_at_frame(zcallable, zobject ? Z_OBJ_P(zobject) : NULL, frame, check_flags, &name, fci_cache, error); -+ ret = zend_is_callable_at_frame(zcallable, zobject ? Z_OBJ_P(zobject) : NULL, frame, check_flags, fci_cache, error); -+ name = zend_get_callable_name_ex(zcallable, zobject); - #endif - if (callable_name) - { -- cgit