helly Wed Oct 2 11:10:11 2002 EDT
Modified files:
/php4/main output.c
Log:
Modified get_status(): Display chunk_size allways and size which is in
most cases initial_size as well as block_size only when used.
Index: php4/main/output.c
diff -u php4/main/output.c:1.126 php4/main/output.c:1.127
--- php4/main/output.c:1.126 Wed Oct 2 11:02:15 2002
+++ php4/main/output.c Wed Oct 2 11:10:11 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.126 2002/10/02 15:02:15 helly Exp $ */
+/* $Id: output.c,v 1.127 2002/10/02 15:10:11 helly Exp $ */
#include "php.h"
#include "ext/standard/head.h"
@@ -869,14 +869,17 @@
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
