Fix the output buffering bug Andre found

diff --git a/ext/standard/output.c b/ext/standard/output.c
index 7c25b736036f61ce7f3680527289f28b037c3d77..3180c912a7843c0b00f2ab39ae81eb1bbf7e60c8 100644 (file)
--- a/ext/standard/output.c
+++ b/ext/standard/output.c
@@ -157,6 +157,7 @@ PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush)
                orig_buffer->value.str.len = OG(active_ob_buffer).text_length;
                orig_buffer->type = IS_STRING;
                orig_buffer->refcount=2;        /* don't let call_user_function() destroy our buffer */
+               orig_buffer->is_ref=1;
 
                ALLOC_INIT_ZVAL(z_status);
                Z_TYPE_P(z_status) = IS_LONG;

diff --git a/main/output.c b/main/output.c
index 7c25b736036f61ce7f3680527289f28b037c3d77..3180c912a7843c0b00f2ab39ae81eb1bbf7e60c8 100644 (file)
--- a/main/output.c
+++ b/main/output.c
@@ -157,6 +157,7 @@ PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush)
                orig_buffer->value.str.len = OG(active_ob_buffer).text_length;
                orig_buffer->type = IS_STRING;
                orig_buffer->refcount=2;        /* don't let call_user_function() destroy our buffer */
+               orig_buffer->is_ref=1;
 
                ALLOC_INIT_ZVAL(z_status);
                Z_TYPE_P(z_status) = IS_LONG;