diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-09-02 14:15:39 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-09-02 14:15:39 -0700 |
| commit | fe551c089a7d309e3fa08513f1d1e287141cd202 (patch) | |
| tree | 8040fec8304e5f5c159675e7d500a97fd2e00f95 | |
| parent | 53fa6c5b6b5b09059ba54c8912d0c0aef57aa4ff (diff) | |
| download | php-git-fe551c089a7d309e3fa08513f1d1e287141cd202.tar.gz | |
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.
| -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) - OpenSSL: . Fixed bug #41631 (socket timeouts not honored in blocking SSL reads). 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); |