diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-03-12 00:37:28 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-03-12 00:37:28 +0100 |
| commit | 99230784f5524f5387a8a6760bdaf9aa2eb91545 (patch) | |
| tree | 8e7b56d0e65d2d82c4d84c680cef7ac41b6825fa /Zend/zend_execute_API.c | |
| parent | dbcdf857968d72a7045610dccb6da650a1a8deda (diff) | |
| parent | 6529d7acd9912a609924633a43e6562799566225 (diff) | |
| download | php-git-99230784f5524f5387a8a6760bdaf9aa2eb91545.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
zend_weakrefs
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index ed9dab449e..aaf7f72cb6 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -33,6 +33,7 @@ #include "zend_generators.h" #include "zend_vm.h" #include "zend_float.h" +#include "zend_weakrefs.h" #ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif @@ -181,6 +182,8 @@ void init_executor(void) /* {{{ */ EG(persistent_functions_count) = EG(function_table)->nNumUsed; EG(persistent_classes_count) = EG(class_table)->nNumUsed; + zend_weakrefs_init(); + EG(active) = 1; } /* }}} */ @@ -275,6 +278,8 @@ void shutdown_executor(void) /* {{{ */ zend_objects_store_free_object_storage(&EG(objects_store), fast_shutdown); + zend_weakrefs_shutdown(); + /* All resources and objects are destroyed. */ /* No PHP callback functions may be called after this point. */ EG(active) = 0; |