archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

output is started in php_module_startup(), no need to start it twice

Browse source 
fixes leaks in sapi/cgi/tests/005.phpt
This commit is contained in:
Antony Dovgal 2007-09-08 11:10:37 +00:00
parent 67e6942045
commit eec31a3df3
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sapi/cgi/cgi_main.c
View file

@ -1422,7 +1422,6 @@ consult the installation file that came with this distribution, or visit \n\
case '?': case '?':
fcgi_shutdown(); fcgi_shutdown();
no_headers = 1; no_headers = 1;
php_output_tearup();
SG(headers_sent) = 1; SG(headers_sent) = 1;
php_cgi_usage(argv[0]); php_cgi_usage(argv[0]);
php_output_end_all(TSRMLS_C); 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 && !fastcgi) {
if (cgi_sapi_module.php_ini_path_override && cgi_sapi_module.php_ini_ignore) { if (cgi_sapi_module.php_ini_path_override && cgi_sapi_module.php_ini_ignore) {
no_headers = 1; no_headers = 1;
php_output_tearup();
SG(headers_sent) = 1; SG(headers_sent) = 1;
php_printf("You cannot use both -n and -c switch. Use -h for help.\n"); php_printf("You cannot use both -n and -c switch. Use -h for help.\n");
php_output_end_all(TSRMLS_C); php_output_end_all(TSRMLS_C);
@ -1506,7 +1504,6 @@ consult the installation file that came with this distribution, or visit \n\
break; break;
case 'm': /* list compiled in modules */ case 'm': /* list compiled in modules */
php_output_tearup();
SG(headers_sent) = 1; SG(headers_sent) = 1;
php_printf("[PHP Modules]\n"); php_printf("[PHP Modules]\n");
print_modules(TSRMLS_C); print_modules(TSRMLS_C);