diff options
| author | Marcus Boerger <helly@php.net> | 2002-10-02 15:10:11 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2002-10-02 15:10:11 +0000 |
| commit | ff51ed7c6f3a9853d719cad22df67660c7af09a0 (patch) | |
| tree | 154a78cff92a3ad285b3507e8bfaf5642fc03a4f /main/output.c | |
| parent | d4bba6d158b75128c590dc6de7ec07ccbdf2a7c9 (diff) | |
| download | php-git-ff51ed7c6f3a9853d719cad22df67660c7af09a0.tar.gz | |
Modified get_status(): Display chunk_size allways and size which is in
most cases initial_size as well as block_size only when used.
Diffstat (limited to 'main/output.c')
| -rw-r--r-- | main/output.c | 7 |
1 files changed, 5 insertions, 2 deletions
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); |