diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-09-02 14:16:17 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-09-02 14:18:05 -0700 |
| commit | 70f92aa97e75a9bfa6a0377f9ef0574efcbe6280 (patch) | |
| tree | 5466875f719d4841abdad75188d9d3e80636c1e2 | |
| parent | af85eff5b6c77681e7e4f9440fa35dbe5c1529ae (diff) | |
| parent | fe551c089a7d309e3fa08513f1d1e287141cd202 (diff) | |
| download | php-git-70f92aa97e75a9bfa6a0377f9ef0574efcbe6280.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | main/main.c | 6 |
2 files changed, 0 insertions, 8 deletions
@@ -6,8 +6,6 @@ PHP NEWS . Fixed bug #47358 (glob returns error, should be empty array()). (Pierre) . Fixed bug #65463 (SIGSEGV during zend_shutdown()). (Keyur Govande) . Fixed bug #66036 (Crash on SIGTERM in apache process). (Keyur Govande) - . Fixed bug #67644 (Memory corruption & crash during ob_start function - callback). (Stas) . Fixed bug #67878 (program_prefix not honoured in man pages). (Remi) - COM: diff --git a/main/main.c b/main/main.c index 3eaecf0fe4..66e4b6e93f 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); |