summaryrefslogtreecommitdiff
path: root/main/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'main/main.c')
-rw-r--r--main/main.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/main/main.c b/main/main.c
index 60f5a16c4b..4adc5e96b2 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1843,6 +1843,12 @@ void php_request_shutdown(void *dummy)
}
} zend_end_try();
+ /* Output buffer handlers may have created new objects. Mark these objects
+ as destructed to avoid calling their dtors too late on shutdown when
+ all dtors were supposed to be cleaned
+ */
+ zend_objects_store_mark_destructed(&EG(objects_store) TSRMLS_CC);
+
/* 4. Reset max_execution_time (no longer executing php code after response sent) */
zend_try {
zend_unset_timeout(TSRMLS_C);