From: Jérôme Loyet Date: Sun, 9 Oct 2011 14:36:11 +0000 (+0000) Subject: - Fixed bug #55533 (The -d parameter doesn't work) X-Git-Tag: php-5.3.9RC1~44 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3982cda83bc556c4d633d2ea3a2ea967fe9e532f;p=php - Fixed bug #55533 (The -d parameter doesn't work) --- diff --git a/NEWS b/NEWS index 6439ab99d7..6f298d3b61 100644 --- a/NEWS +++ b/NEWS @@ -75,6 +75,7 @@ PHP NEWS . Fixed bug #53872 (internal corruption of phar). (Hannes) - PHP-FPM SAPI: + . Fixed bug #55533 (The -d parameter doesn't work). (fat) . Implemented FR #52569 (Add the "ondemand" process-manager to allow zero children). (fat) . Fixed bug #55486 (status show BIG processes number). (fat) diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index f432cbd15d..a0249405ac 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -1528,6 +1528,7 @@ int main(int argc, char *argv[]) char *fpm_prefix = NULL; char *fpm_pid = NULL; int test_conf = 0; + int php_information = 0; fcgi_init(); @@ -1638,20 +1639,8 @@ int main(int argc, char *argv[]) goto out; case 'i': /* php info & quit */ - cgi_sapi_module.phpinfo_as_text = 1; - cgi_sapi_module.startup(&cgi_sapi_module); - if (php_request_startup(TSRMLS_C) == FAILURE) { - SG(server_context) = NULL; - php_module_shutdown(TSRMLS_C); - return FAILURE; - } - SG(headers_sent) = 1; - SG(request_info).no_headers = 1; - php_print_info(0xFFFFFFFF TSRMLS_CC); - php_request_shutdown((void *) 0); - fcgi_shutdown(); - exit_status = 0; - goto out; + php_information = 1; + break; default: case 'h': @@ -1688,6 +1677,23 @@ int main(int argc, char *argv[]) } } + if (php_information) { + cgi_sapi_module.phpinfo_as_text = 1; + cgi_sapi_module.startup(&cgi_sapi_module); + if (php_request_startup(TSRMLS_C) == FAILURE) { + SG(server_context) = NULL; + php_module_shutdown(TSRMLS_C); + return FAILURE; + } + SG(headers_sent) = 1; + SG(request_info).no_headers = 1; + php_print_info(0xFFFFFFFF TSRMLS_CC); + php_request_shutdown((void *) 0); + fcgi_shutdown(); + exit_status = 0; + goto out; + } + /* No other args are permitted here as there is not interactive mode */ if (argc != php_optind) { cgi_sapi_module.startup(&cgi_sapi_module);