fix bug #60322 (ob_get_clean() now raises an E_NOTICE if no buffers exist)

diff --git a/main/output.c b/main/output.c
index 2ee34f59a423710db9272328b518ba60c366f6d3..b42809fcbc7b486c6966455bac7dc8f9e0e16d26 100644 (file)
--- a/main/output.c
+++ b/main/output.c
@@ -1360,6 +1360,10 @@ PHP_FUNCTION(ob_get_clean)
                return;
        }
 
+       if(!OG(active)) {
+               RETURN_FALSE;
+       }
+
        if (php_output_get_contents(return_value TSRMLS_CC) == FAILURE) {
                php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer. No buffer to delete");
                RETURN_FALSE;

diff --git a/tests/output/bug60322.phpt b/tests/output/bug60322.phpt
new file mode 100644 (file)
index 0000000..c28ab4d
--- /dev/null
+++ b/tests/output/bug60322.phpt
@@ -0,0 +1,8 @@
+--TEST--
+Bug #60322 (ob_get_clean() now raises an E_NOTICE if no buffers exist)
+--FILE--
+<?php
+while(ob_get_clean()) ;
+var_dump(ob_get_clean());
+--EXPECT--
+bool(false)