From fe551c089a7d309e3fa08513f1d1e287141cd202 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Tue, 2 Sep 2014 14:15:39 -0700 Subject: Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback" This reverts commit 53fa6c5b6b5b09059ba54c8912d0c0aef57aa4ff. The change breaks tests, so not putting it into 5.4. --- main/main.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'main') diff --git a/main/main.c b/main/main.c index e0b0916185..8546500f32 100644 --- a/main/main.c +++ b/main/main.c @@ -1767,12 +1767,6 @@ 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); -- cgit v1.2.1