tony2001 Sat Sep 8 11:10:37 2007 UTC Modified files: /php-src/sapi/cgi cgi_main.c Log: output is started in php_module_startup(), no need to start it twice fixes leaks in sapi/cgi/tests/005.phpt http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.332&r2=1.333&diff_format=u Index: php-src/sapi/cgi/cgi_main.c diff -u php-src/sapi/cgi/cgi_main.c:1.332 php-src/sapi/cgi/cgi_main.c:1.333 --- php-src/sapi/cgi/cgi_main.c:1.332 Wed Sep 5 08:26:49 2007 +++ php-src/sapi/cgi/cgi_main.c Sat Sep 8 11:10:37 2007 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cgi_main.c,v 1.332 2007/09/05 08:26:49 dmitry Exp $ */ +/* $Id: cgi_main.c,v 1.333 2007/09/08 11:10:37 tony2001 Exp $ */ #include "php.h" #include "php_globals.h" @@ -1422,7 +1422,6 @@ 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 @@ 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 @@ break; case 'm': /* list compiled in modules */ - php_output_tearup(); SG(headers_sent) = 1; php_printf("[PHP Modules]\n"); print_modules(TSRMLS_C);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php