]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 18 Mar 2019 09:04:29 +0000 (10:04 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 18 Mar 2019 09:04:29 +0000 (10:04 +0100)
1  2 
Zend/zend_globals.h
Zend/zend_objects_API.c

Simple merge
index 3389b646081624f9b1b9a5273ae29904ce0038fc,3e3c8a800524763c6841aecf69278bd5fcbbd550..c5ac9708e5a49f8a7341fe0cc79209eb049c470f
@@@ -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++) {