]> granicus.if.org Git - php/commitdiff
output is started in php_module_startup(), no need to start it twice
authorAntony Dovgal <tony2001@php.net>
Sat, 8 Sep 2007 11:10:37 +0000 (11:10 +0000)
committerAntony Dovgal <tony2001@php.net>
Sat, 8 Sep 2007 11:10:37 +0000 (11:10 +0000)
fixes leaks in sapi/cgi/tests/005.phpt

sapi/cgi/cgi_main.c

index f42764f6e6a19d525d5cfbc864940956a45aae64..2cba3a5d6064bcb94c92605e1db67fb5ac91dc11 100644 (file)
@@ -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);