From: Marcus Boerger <helly@php.net>
Date: Wed, 2 Oct 2002 15:10:11 +0000 (+0000)
Subject: Modified get_status(): Display chunk_size allways and size which is in
X-Git-Tag: MODERN_SYMMETRIC_SESSION_BEHAVIOUR_20021003~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff51ed7c6f3a9853d719cad22df67660c7af09a0;p=php

Modified get_status(): Display chunk_size allways and size which is in
most cases initial_size as well as block_size only when used.
---

diff --git a/main/output.c b/main/output.c
index bbf0807231..9fdffdc994 100644
--- a/main/output.c
+++ b/main/output.c
@@ -869,14 +869,17 @@ static int php_ob_buffer_status(php_ob_buffer *ob_buffer, zval *result)
 		return FAILURE;
 	}
 
+	add_assoc_long(elem, "chunk_size", ob_buffer->chunk_size);
+	if (!ob_buffer->chunk_size) {
+		add_assoc_long(elem, "size", ob_buffer->size);
+		add_assoc_long(elem, "block_size", ob_buffer->block_size);
+	}
 	if (ob_buffer->internal_output_handler) {
 		add_assoc_long(elem, "type", PHP_OUTPUT_HANDLER_INTERNAL);
 		add_assoc_long(elem, "buffer_size", ob_buffer->internal_output_handler_buffer_size);
 	}
 	else {
 		add_assoc_long(elem, "type", PHP_OUTPUT_HANDLER_USER);
-		add_assoc_long(elem, "initial_size", ob_buffer->size);
-		add_assoc_long(elem, "chunk_size", ob_buffer->chunk_size);
 	}
 	add_assoc_long(elem, "status", ob_buffer->status);
 	add_assoc_string(elem, "name", ob_buffer->handler_name, 1);