From: Zeev Suraski <zeev@php.net>
Date: Tue, 26 Jun 2001 18:30:31 +0000 (+0000)
Subject: Fix bug #11678
X-Git-Tag: PRE_TSRM_MERGE_PATCH~331
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f35b85b4c109c404ab4b12f1ad5f4af9cf5ac97f;p=php

Fix bug #11678
---

diff --git a/ext/standard/output.c b/ext/standard/output.c
index 26f95af2e4..cacf045a0c 100644
--- a/ext/standard/output.c
+++ b/ext/standard/output.c
@@ -540,7 +540,16 @@ PHP_FUNCTION(ob_start)
 			break;
 	}
 	if (php_start_ob_buffer(output_handler, chunk_size)==FAILURE) {
-		php_error(E_WARNING, "Cannot use output buffering in output buffering display handlers");
+		SLS_FETCH();
+		OLS_FETCH();
+
+		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(nesting_level) = 0;
+		php_error(E_ERROR, "Cannot use output buffering in output buffering display handlers");
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
diff --git a/main/output.c b/main/output.c
index 26f95af2e4..cacf045a0c 100644
--- a/main/output.c
+++ b/main/output.c
@@ -540,7 +540,16 @@ PHP_FUNCTION(ob_start)
 			break;
 	}
 	if (php_start_ob_buffer(output_handler, chunk_size)==FAILURE) {
-		php_error(E_WARNING, "Cannot use output buffering in output buffering display handlers");
+		SLS_FETCH();
+		OLS_FETCH();
+
+		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(nesting_level) = 0;
+		php_error(E_ERROR, "Cannot use output buffering in output buffering display handlers");
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;