From ff7e8e94d75c8d749e828d3f753aaa3f34e67528 Mon Sep 17 00:00:00 2001 From: Kalle Sommer Nielsen Date: Sat, 27 Dec 2014 20:56:39 +0100 Subject: [PATCH] Implemented FR #55428 (E_RECOVERABLE_ERROR when output buffering in output buffering handler) ## Can probably go in lower branches, but I'd like to keep it in ## master for now --- NEWS | 1 + UPGRADING | 4 +++- main/output.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 152687ff9f..a89018d174 100644 --- a/NEWS +++ b/NEWS @@ -33,6 +33,7 @@ . Added \u{xxxxx} Unicode Codepoint Escape Syntax. (Andrea) . Fixed oversight where define() did not support arrays yet const syntax did. (Andrea, Dmitry) . Use "integer" and "float" instead of "long" and "double" in ZPP, type hint and conversion error messages. (Andrea) + . Implemented FR #55428 (E_RECOVERABLE_ERROR when output buffering in output buffering handler). (Kalle) - Date: . Fixed day_of_week function as it could sometimes return negative values diff --git a/UPGRADING b/UPGRADING index 3e4fbf83d3..3cdf4f5a2e 100644 --- a/UPGRADING +++ b/UPGRADING @@ -1,4 +1,4 @@ -$Id$ +$Id$ PHP X.Y UPGRADE NOTES @@ -52,6 +52,8 @@ PHP X.Y UPGRADE NOTES However, \u without a following { is unaffected, so "\u202e" won't error and will work the same as before. . zend_function.common.num_args don't include the variadic argument anymore. + . ob_start() no longer issues an E_ERROR, but instead an E_RECOVERABLE_ERROR in case an + output buffer is created in an output buffer handler. - DBA . dba_delete() now returns false if the key was not found for the inifile diff --git a/main/output.c b/main/output.c index c287933fb1..09fde94b87 100644 --- a/main/output.c +++ b/main/output.c @@ -769,7 +769,7 @@ static inline int php_output_lock_error(int op) if (op && OG(active) && OG(running)) { /* fatal error */ php_output_deactivate(); - php_error_docref("ref.outcontrol", E_ERROR, "Cannot use output buffering in output buffering display handlers"); + php_error_docref("ref.outcontrol", E_RECOVERABLE_ERROR, "Cannot use output buffering in output buffering display handlers"); return 1; } return 0; -- 2.49.0