We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 8660449 commit 9bc56c3Copy full SHA for 9bc56c3
Zend/zend_globals.h
@@ -311,6 +311,7 @@ struct _zend_executor_globals {
311
#define EG_FLAGS_IN_SHUTDOWN (1<<0)
312
#define EG_FLAGS_OBJECT_STORE_NO_REUSE (1<<1)
313
#define EG_FLAGS_IN_RESOURCE_SHUTDOWN (1<<2)
314
+#define EG_FLAGS_IN_EXECUTOR_SHUTDOWN (1<<3)
315
316
struct _zend_ini_scanner_globals {
317
zend_file_handle *yy_in;
main/main.c
@@ -1846,7 +1846,11 @@ void php_request_shutdown(void *dummy)
1846
{
1847
bool report_memleaks;
1848
1849
- EG(flags) |= EG_FLAGS_IN_SHUTDOWN;
+ if (EG(flags) & EG_FLAGS_IN_EXECUTOR_SHUTDOWN) {
1850
+ return;
1851
+ }
1852
+
1853
+ EG(flags) |= EG_FLAGS_IN_SHUTDOWN | EG_FLAGS_IN_EXECUTOR_SHUTDOWN;
1854
1855
report_memleaks = PG(report_memleaks);
1856
0 commit comments