Merge branch 'PHP-5.6'

* PHP-5.6:
  Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"

1 files changed, 0 insertions, 6 deletions

diff --git a/main/main.c b/main/main.c
index 475ceb7d3d..5c4cc91e44 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1821,12 +1821,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);