cvs: php4 /main output.c
| From: | Zeev Suraski | Date: | Mon, 23 Sep 2002 14:18:43 +0000 |
| Subject: | cvs: php4 /main output.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-14164@lists.php.net to get a copy of this message | ||
zeev Mon Sep 23 10:18:43 2002 EDT
Modified files:
/php4/main output.c
Log:
Fix bug #19525
Index: php4/main/output.c
diff -u php4/main/output.c:1.120 php4/main/output.c:1.121
--- php4/main/output.c:1.120 Sun Sep 1 07:33:19 2002
+++ php4/main/output.c Mon Sep 23 10:18:42 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.120 2002/09/01 11:33:19 sebastian Exp $ */
+/* $Id: output.c,v 1.121 2002/09/23 14:18:42 zeev Exp $ */
#include "php.h"
#include "ext/standard/head.h"
@@ -120,6 +120,12 @@
uint initial_size, block_size;
if (OG(ob_lock)) {
+ if (SG(headers_sent) && !SG(request_info).headers_only) {
+ OG(php_body_write) = php_ub_body_write_no_header;
+ } else {
+ OG(php_body_write) = php_ub_body_write;
+ }
+ OG(ob_nesting_level) = 0;
php_error_docref("ref.outcontrol" TSRMLS_CC, E_ERROR, "Cannot use output buffering
in output buffering display handlers");
return FAILURE;
}