MFH: Fixed bug #24951 (ob_flush() needlessly destroys output handler).

diff --git a/main/output.c b/main/output.c
index c029d32209d5ae5ea9eaeb319680228dc4ed261b..0f530942e065bc5f1865c33260f456547577cec8 100644 (file)
--- a/main/output.c
+++ b/main/output.c
@@ -247,7 +247,9 @@ PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush TSRMLS
                        }
                }
                OG(ob_lock) = 0;
-               zval_ptr_dtor(&OG(active_ob_buffer).output_handler);
+               if (!just_flush) {
+                       zval_ptr_dtor(&OG(active_ob_buffer).output_handler);
+               }
                orig_buffer->refcount -=2;
                if (orig_buffer->refcount <= 0) { /* free the zval */
                        zval_dtor(orig_buffer);