From 63e5f97da40470c00c1b53f95a163076184619ff Mon Sep 17 00:00:00 2001
From: Stanislav Malyshev <stas@php.net>
Date: Mon, 26 Dec 2011 05:01:46 +0000
Subject: [PATCH] fix bug #60322 (ob_get_clean() now raises an E_NOTICE if no
 buffers exist)

---
 main/output.c              | 4 ++++
 tests/output/bug60322.phpt | 8 ++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 tests/output/bug60322.phpt

diff --git a/main/output.c b/main/output.c
index 2ee34f59a4..b42809fcbc 100644
--- 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
index 0000000000..c28ab4d617
--- /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)
-- 
2.40.0