- new output control code

# scan README.NEW-OUTPUT-API to get a grasp
# tree has been tagged with BEFORE_NEW_OUTPUT_API
#
# TODO:
#  - improve existing output handlers
#  - move zlib.output_compression cruft from SAPI.c to zlib.c
#  - output_encoding handling was ambigious, resp. is undefined yet
#  - more tests

1 files changed, 4 insertions, 4 deletions

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index c4b05786d7..3deaab2804 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -719,7 +719,7 @@ int main(int argc, char *argv[])
 					goto err;
 				}
 				php_cli_usage(argv[0]);
-				php_end_ob_buffers(1 TSRMLS_CC);
+				php_output_end_all();
 				exit_status=0;
 				goto out;
 
@@ -728,7 +728,7 @@ int main(int argc, char *argv[])
 					goto err;
 				}
 				php_print_info(0xFFFFFFFF TSRMLS_CC);
-				php_end_ob_buffers(1 TSRMLS_CC);
+				php_output_end_all();
 				exit_status=0;
 				goto out;
 
@@ -741,7 +741,7 @@ int main(int argc, char *argv[])
 				php_printf("\n[Zend Modules]\n");
 				print_extensions(TSRMLS_C);
 				php_printf("\n");
-				php_end_ob_buffers(1 TSRMLS_CC);
+				php_output_end_all();
 				exit_status=0;
 				goto out;
 
@@ -763,7 +763,7 @@ int main(int argc, char *argv[])
 #endif
 					get_zend_version()
 				);
-				php_end_ob_buffers(1 TSRMLS_CC);
+				php_output_end_all();
 				exit_status=0;
 				goto out;