Implemented FR #55428 (E_RECOVERABLE_ERROR when output buffering in output buffering...

## Can probably go in lower branches, but I'd like to keep it in
## master for now

diff --git a/NEWS b/NEWS
index 152687ff9f1dd9c7addb7b8c85d9c8446b3cd9b3..a89018d17462c9613b2de400973bc4d52411999f 100644 (file)
--- 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 3e4fbf83d36d0497eafae0f9817183a2194859ea..3cdf4f5a2e254aafd2bdd2cf8e0554d1dffa6034 100644 (file)
--- 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 c287933fb171b14fb0c57ae416c0f35f4ebfc2d2..09fde94b87f64c4012425d2351226ee1d46017c7 100644 (file)
--- 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;