From 0143df7fe57623fc3ff1ac0e80edbf8aeb70a762 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 3 Sep 2020 07:36:37 +0200 Subject: update to 3.1.5 drop patch merged upstream --- 284.patch | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 284.patch (limited to '284.patch') diff --git a/284.patch b/284.patch deleted file mode 100644 index 7462b9c..0000000 --- a/284.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 46e8fa27851693877c32d0dd1239789bf2a78865 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Wed, 2 Sep 2020 09:50:49 +0200 -Subject: [PATCH] fix for 8.0.0beta3 - ---- - src/php7/igbinary.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/php7/igbinary.c b/src/php7/igbinary.c -index 992867a..d62e8dd 100644 ---- a/src/php7/igbinary.c -+++ b/src/php7/igbinary.c -@@ -2751,7 +2751,11 @@ inline static int igbinary_unserialize_object(struct igbinary_unserialize_data * - break; - } - if (incomplete_class) { -+#if PHP_VERSION_ID >= 80000 -+ php_store_class_name(z, class_name); -+#else - php_store_class_name(z, ZSTR_VAL(class_name), ZSTR_LEN(class_name)); -+#endif - #if PHP_VERSION_ID >= 70400 - } else { - if (zend_hash_str_exists(&ce->function_table, "__unserialize", sizeof("__unserialize") - 1)) { -@@ -2802,7 +2806,11 @@ inline static int igbinary_unserialize_object(struct igbinary_unserialize_data * - } - - if (incomplete_class) { -+#if PHP_VERSION_ID >= 80000 -+ php_store_class_name(z, class_name); -+#else - php_store_class_name(z, ZSTR_VAL(class_name), ZSTR_LEN(class_name)); -+#endif - } - struct igbinary_value_ref *ref = &IGB_REF_VAL_2(igsd, ref_n); - if ((flags & WANT_REF) != 0) { -- cgit