#19: Changes in the Zend Async API shutdown mechanism

Author: EdmondDantes

Zend/zend_async_API.c

@@ -197,11 +197,13 @@ void zend_async_globals_dtor(void)
 #endif
 }
 
-void zend_async_shutdown(void)
+void zend_async_api_shutdown(void)
 {
-	zend_async_globals_dtor();
 	zend_async_internal_context_api_shutdown();
 	zend_async_main_handlers_shutdown();
+#ifndef ZTS
+	zend_async_globals_dtor();
+#endif
 }
 
 ZEND_API int zend_async_get_api_version_number(void)

Zend/zend_async_API.h

@@ -1111,7 +1111,7 @@ ZEND_API bool zend_async_is_enabled(void);
 ZEND_API bool zend_scheduler_is_enabled(void);
 
 void zend_async_init(void);
-void zend_async_shutdown(void);
+void zend_async_api_shutdown(void);
 void zend_async_globals_ctor(void);
 void zend_async_globals_dtor(void);
 

main/main.c

@@ -2515,12 +2515,13 @@ void php_module_shutdown(void)
 
 	module_initialized = false;
 
+#ifdef PHP_ASYNC_API
+	zend_async_api_shutdown();
+#endif
+
 #ifndef ZTS
 	core_globals_dtor(&core_globals);
 	gc_globals_dtor();
-	#ifdef PHP_ASYNC_API
-	zend_async_globals_dtor();
-	#endif
 #else
 	ts_free_id(core_globals_id);
 #endif