cvs: php4 /main output.c
| From: | Marcus B�rger | Date: | Wed, 21 Aug 2002 01:00:58 +0000 |
| Subject: | cvs: php4 /main output.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13512@lists.php.net to get a copy of this message | ||
helly Tue Aug 20 21:00:58 2002 EDT
Modified files:
/php4/main output.c
Log:
Ignore double_buffering for ob_start().
Index: php4/main/output.c
diff -u php4/main/output.c:1.112 php4/main/output.c:1.113
--- php4/main/output.c:1.112 Tue Aug 20 19:23:25 2002
+++ php4/main/output.c Tue Aug 20 21:00:56 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.112 2002/08/20 23:23:25 helly Exp $ */
+/* $Id: output.c,v 1.113 2002/08/21 01:00:56 helly Exp $ */
#include "php.h"
#include "ext/standard/head.h"
@@ -135,7 +135,7 @@
php_error_docref("ref.outcontrol" TSRMLS_CC, E_ERROR, "Cannot use output buffering
in output buffering display handlers");
return FAILURE;
}
- if (OG(ob_nesting_level)==0 && PG(double_buffering)) {
+ if (OG(ob_nesting_level)==0 && PG(double_buffering) && chunk_size) {
initial_chunk_size = php_ob_default_buffer_size(TSRMLS_C);
initial_size = 4*initial_chunk_size;
block_size = initial_chunk_size;