- Reverted r296062 and r296065

1 files changed, 4 insertions, 4 deletions

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index e5dcfa1e71..635445e92f 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -797,7 +797,7 @@ int main(int argc, char *argv[])
 				}
 				request_started = 1;
 				php_cli_usage(argv[0]);
-				php_output_end_all(TSRMLS_C);
+				php_end_ob_buffers(1 TSRMLS_CC);
 				exit_status=0;
 				goto out;
 
@@ -807,7 +807,7 @@ int main(int argc, char *argv[])
 				}
 				request_started = 1;
 				php_print_info(0xFFFFFFFF TSRMLS_CC);
-				php_output_end_all(TSRMLS_C);
+				php_end_ob_buffers(1 TSRMLS_CC);
 				exit_status=0;
 				goto out;
 
@@ -821,7 +821,7 @@ int main(int argc, char *argv[])
 				php_printf("\n[Zend Modules]\n");
 				print_extensions(TSRMLS_C);
 				php_printf("\n");
-				php_output_end_all(TSRMLS_C);
+				php_end_ob_buffers(1 TSRMLS_CC);
 				exit_status=0;
 				goto out;
 
@@ -844,7 +844,7 @@ int main(int argc, char *argv[])
 #endif
 					get_zend_version()
 				);
-				php_output_end_all(TSRMLS_C);
+				php_end_ob_buffers(1 TSRMLS_CC);
 				exit_status=0;
 				goto out;