com php-src: Merge branch 'PHP-7.4': Zend/zend_execute_API .c Zend/zend_globals.h Zend/zend_objects.c Zend /zend_types.h configure.ac
ext/com_dotnet/com_han dlers.c ext/com_dotnet/com_saproxy.c
| From: | Joe Watkins | Date: | Mon, 11 Mar 2019 23:37:28 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.4': Zend/zend_execute_API .c Zend/zend_globals.h Zend/zend_objects.c Zend /zend_types.h configure.ac ext/com_dotnet/com_han dlers.c ext/com_dotnet/com_saproxy.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105092@lists.php.net to get a copy of this message | ||
Commit: 99230784f5524f5387a8a6760bdaf9aa2eb91545
Author: Joe Watkins <krakjoe@php.net> Tue, 12 Mar 2019 00:37:28 +0100
Parents: dbcdf857968d72a7045610dccb6da650a1a8deda 6529d7acd9912a609924633a43e6562799566225
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=99230784f5524f5387a8a6760bdaf9aa2eb91545
Log:
Merge branch 'PHP-7.4'
* PHP-7.4:
zend_weakrefs
Changed paths:
MM Zend/zend_execute_API.c
MM Zend/zend_globals.h
MM Zend/zend_objects.c
MM Zend/zend_types.h
MM configure.ac
MM ext/com_dotnet/com_handlers.c
MM ext/com_dotnet/com_saproxy.c
Diff:
diff --cc Zend/zend_globals.h
index 07d13f6,2f46da0..b665c4e
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@@ -225,6 -225,10 +225,8 @@@ struct _zend_executor_globals
zend_function trampoline;
zend_op call_trampoline_op;
- zend_bool each_deprecation_thrown;
-
+ HashTable weakrefs;
+
void *reserved[ZEND_MAX_RESERVED_RESOURCES];
};
diff --cc ext/com_dotnet/com_handlers.c
index 4f64b55,0a4693f..d00cb14
--- a/ext/com_dotnet/com_handlers.c
+++ b/ext/com_dotnet/com_handlers.c
@@@ -612,9 -615,11 +612,11 @@@ void php_com_object_free_storage(zend_o
zend_hash_destroy(obj->id_of_name_cache);
FREE_HASHTABLE(obj->id_of_name_cache);
}
+
+ zend_object_std_dtor(object);
}
-zend_object* php_com_object_clone(zval *object)
+zend_object* php_com_object_clone(zend_object *object)
{
php_com_dotnet_object *cloneobj, *origobject;
diff --cc ext/com_dotnet/com_saproxy.c
index 225786b,7eec446..ebef643
--- a/ext/com_dotnet/com_saproxy.c
+++ b/ext/com_dotnet/com_saproxy.c
@@@ -368,7 -374,9 +368,10 @@@ static void saproxy_free_storage(zend_o
//??? }
//??? }
+ OBJ_RELEASE(&proxy->obj->zo);
++
+ zend_object_std_dtor(object);
+
- zval_ptr_dtor(proxy->zobj);
efree(proxy->indices);
}