summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2007-09-08 11:10:37 +0000
committerAntony Dovgal <tony2001@php.net>2007-09-08 11:10:37 +0000
commiteec31a3df3f371217cc8aa21b3f75a954b10355c (patch)
tree183eb9e0a8135c750d878f6c51f7bdfd74e1eba9
parent67e694204587e92aef736f99d696fbabad3c8b4d (diff)
downloadphp-git-eec31a3df3f371217cc8aa21b3f75a954b10355c.tar.gz
output is started in php_module_startup(), no need to start it twice
fixes leaks in sapi/cgi/tests/005.phpt
-rw-r--r--sapi/cgi/cgi_main.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index f42764f6e6..2cba3a5d60 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -1422,7 +1422,6 @@ consult the installation file that came with this distribution, or visit \n\
case '?':
fcgi_shutdown();
no_headers = 1;
- php_output_tearup();
SG(headers_sent) = 1;
php_cgi_usage(argv[0]);
php_output_end_all(TSRMLS_C);
@@ -1450,7 +1449,6 @@ consult the installation file that came with this distribution, or visit \n\
if (!cgi && !fastcgi) {
if (cgi_sapi_module.php_ini_path_override && cgi_sapi_module.php_ini_ignore) {
no_headers = 1;
- php_output_tearup();
SG(headers_sent) = 1;
php_printf("You cannot use both -n and -c switch. Use -h for help.\n");
php_output_end_all(TSRMLS_C);
@@ -1506,7 +1504,6 @@ consult the installation file that came with this distribution, or visit \n\
break;
case 'm': /* list compiled in modules */
- php_output_tearup();
SG(headers_sent) = 1;
php_printf("[PHP Modules]\n");
print_modules(TSRMLS_C);