Made ob_start() and friends reentrant. It's now possible to implement this

long-requested functionality, now that output buffering is re-entrant:

function eval_ret($code)
{
	ob_start();
	eval($code);
	$retval = ob_get_contents();
	ob_end_clean();
	return $retval;
}

3 files changed, 5 insertions, 5 deletions

diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
index b6ea226274..25874c4a51 100644
--- a/sapi/apache/php_apache.c
+++ b/sapi/apache/php_apache.c
@@ -320,7 +320,7 @@ PHP_FUNCTION(virtual)
 		RETURN_FALSE;
 	}
 	
-	php_end_ob_buffering(1);
+	php_end_ob_buffers(1);
 	php_header();
 
 	if (run_sub_req(rr)) {
diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c
index d9c3c7674b..52e6002c31 100644
--- a/sapi/apache/sapi_apache.c
+++ b/sapi/apache/sapi_apache.c
@@ -89,7 +89,7 @@ int apache_php_module_main(request_rec *r, int display_source_mode CLS_DC ELS_DC
 	}
 	
 	php_header();			/* Make sure headers have been sent */
-	php_end_ob_buffering(1);
+	php_end_ob_buffers(1);
 	return (OK);
 }
 
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 7e9a00018c..d61bea902f 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -485,7 +485,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
 					php_output_startup();
 					SG(headers_sent) = 1;
 					php_cgi_usage(argv[0]);
-					php_end_ob_buffering(1);
+					php_end_ob_buffers(1);
 					exit(1);
 					break;
 			}
@@ -556,7 +556,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
 					php_output_startup();
 					SG(headers_sent) = 1;
 					php_cgi_usage(argv[0]);
-					php_end_ob_buffering(1);
+					php_end_ob_buffers(1);
 					exit(1);
 					break;
 
@@ -606,7 +606,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
 						SG(headers_sent) = 1;
 					}
 					php_printf("%s\n", PHP_VERSION);
-					php_end_ob_buffering(1);
+					php_end_ob_buffers(1);
 					exit(1);
 					break;