mirror of
https://github.com/php/php-src.git
synced 2024-09-23 10:57:26 +00:00
Merge branch 'PHP-5.6'
* PHP-5.6: Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
This commit is contained in:
commit
91505203c0
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user