summaryrefslogtreecommitdiff
path: root/main/output.c
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2002-09-23 14:18:42 +0000
committerZeev Suraski <zeev@php.net>2002-09-23 14:18:42 +0000
commit85f4abfdac23e66933a7a028c8a109494b8bbc4b (patch)
tree525e401a66d84334130e0be1237e1539343b15fa /main/output.c
parentff12826fc15a3a44440c47647b10b65718f8ea93 (diff)
downloadphp-git-85f4abfdac23e66933a7a028c8a109494b8bbc4b.tar.gz
Fix bug #19525
Diffstat (limited to 'main/output.c')
-rw-r--r--main/output.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/main/output.c b/main/output.c
index 88928bc62f..c55286e385 100644
--- a/main/output.c
+++ b/main/output.c
@@ -120,6 +120,12 @@ PHPAPI int php_start_ob_buffer(zval *output_handler, uint chunk_size, zend_bool
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;
}