fat                                      Sun, 09 Oct 2011 14:36:11 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=317936

Log:
- Fixed bug #55533 (The -d parameter doesn't work)

Bug: https://bugs.php.net/55533 (Assigned) The -d parameter doesn't work
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c
    U   php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_main.c
    U   php/php-src/trunk/sapi/fpm/fpm/fpm_main.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2011-10-09 11:13:27 UTC (rev 317935)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-10-09 14:36:11 UTC (rev 317936)
@@ -75,6 +75,7 @@
   . 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)

Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c        2011-10-09 
11:13:27 UTC (rev 317935)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c        2011-10-09 
14:36:11 UTC (rev 317936)
@@ -1528,6 +1528,7 @@
        char *fpm_prefix = NULL;
        char *fpm_pid = NULL;
        int test_conf = 0;
+       int php_information = 0;

        fcgi_init();

@@ -1638,20 +1639,8 @@
                                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 @@
                }
        }

+       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);

Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_main.c        2011-10-09 
11:13:27 UTC (rev 317935)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_main.c        2011-10-09 
14:36:11 UTC (rev 317936)
@@ -1521,6 +1521,7 @@
        char *fpm_prefix = NULL;
        char *fpm_pid = NULL;
        int test_conf = 0;
+       int php_information = 0;

 #ifdef HAVE_SIGNAL_H
 #if defined(SIGPIPE) && defined(SIG_IGN)
@@ -1632,20 +1633,8 @@
                                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':
@@ -1682,6 +1671,23 @@
                }
        }

+       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 no interactive mode */
        if (argc != php_optind) {
                cgi_sapi_module.startup(&cgi_sapi_module);

Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_main.c   2011-10-09 11:13:27 UTC (rev 
317935)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_main.c   2011-10-09 14:36:11 UTC (rev 
317936)
@@ -1521,6 +1521,7 @@
        char *fpm_prefix = NULL;
        char *fpm_pid = NULL;
        int test_conf = 0;
+       int php_information = 0;

 #ifdef HAVE_SIGNAL_H
 #if defined(SIGPIPE) && defined(SIG_IGN)
@@ -1632,20 +1633,8 @@
                                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':
@@ -1682,6 +1671,23 @@
                }
        }

+       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 no interactive mode */
        if (argc != php_optind) {
                cgi_sapi_module.startup(&cgi_sapi_module);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to