com php-src: Merge branch 'PHP-7.2' into PHP-7.3: Zend/zend_g lobals.h Zend/zend_objects_API.c
| From: | Nikita Popov | Date: | Mon, 18 Mar 2019 09:04:29 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: Zend/zend_g lobals.h Zend/zend_objects_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105191@lists.php.net to get a copy of this message | ||
Commit: 61eebb559e6c473aaee91a545c14134969752783
Author: Nikita Popov <nikita.ppv@gmail.com> Mon, 18 Mar 2019 10:04:29 +0100
Parents: d209ccd4ccf1b2ea63e79bd9f6d7d474693143a2 bd6eabd6591ae5a7c9ad75dfbe7cc575fa907eac
Branches: PHP-7.3 PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=61eebb559e6c473aaee91a545c14134969752783
Log:
Merge branch 'PHP-7.2' into PHP-7.3
Changed paths:
MM Zend/zend_globals.h
MM Zend/zend_objects_API.c
Diff:
diff --cc Zend/zend_objects_API.c
index 3389b64,3e3c8a8..c5ac970
--- a/Zend/zend_objects_API.c
+++ b/Zend/zend_objects_API.c
@@@ -39,8 -41,9 +39,9 @@@ ZEND_API void ZEND_FASTCALL zend_object
objects->object_buckets = NULL;
}
-ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects)
+ZEND_API void ZEND_FASTCALL zend_objects_store_call_destructors(zend_objects_store *objects)
{
+ EG(flags) |= EG_FLAGS_OBJECT_STORE_NO_REUSE;
if (objects->top > 1) {
uint32_t i;
for (i = 1; i < objects->top; i++) {