Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #65593 (Segfault when calling ob_start from output buffering callback)

2 files changed, 23 insertions, 10 deletions

diff --git a/main/output.c b/main/output.c
index 2991d0dba1..64729ac4a4 100644
--- a/main/output.c
+++ b/main/output.c
@@ -179,21 +179,21 @@ PHPAPI void php_output_deactivate(void)
 {
 	php_output_handler **handler = NULL;
 
-	php_output_header();
+	if ((OG(flags) & PHP_OUTPUT_ACTIVATED)) {
 
-	OG(flags) ^= PHP_OUTPUT_ACTIVATED;
-	OG(active) = NULL;
-	OG(running) = NULL;
+		OG(flags) ^= PHP_OUTPUT_ACTIVATED;
+		OG(active) = NULL;
+		OG(running) = NULL;
 
-	/* release all output handlers */
-	if (OG(handlers).elements) {
-		while ((handler = zend_stack_top(&OG(handlers)))) {
-			php_output_handler_free(handler);
-			zend_stack_del_top(&OG(handlers));
+		/* release all output handlers */
+		if (OG(handlers).elements) {
+			while ((handler = zend_stack_top(&OG(handlers)))) {
+				php_output_handler_free(handler);
+				zend_stack_del_top(&OG(handlers));
+			}
 		}
 		zend_stack_destroy(&OG(handlers));
 	}
-
 }
 /* }}} */
 
diff --git a/tests/output/bug65593.phpt b/tests/output/bug65593.phpt
new file mode 100644
index 0000000000..336c73e03d
--- /dev/null
+++ b/tests/output/bug65593.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Bug #65593 (ob_start(function(){ob_start();});)
+--FILE--
+<?php 
+echo "Test\n";
+
+ob_start(function(){ob_start();});
+?>
+===DONE===
+--EXPECT--
+Test
+
+Fatal error: Cannot destroy active lambda function in /home/mike/src/php-5.5/tests/output/bug65593.php on line 4