felipe                                   Thu, 23 Jun 2011 00:25:54 +0000

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

Log:
- Fixed crash on startup

Changed paths:
    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_4/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_main.c        2011-06-22 
21:22:06 UTC (rev 312388)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_main.c        2011-06-23 
00:25:54 UTC (rev 312389)
@@ -1587,8 +1587,6 @@
        char *fpm_prefix = NULL;
        int test_conf = 0;

-       fcgi_init();
-
 #ifdef HAVE_SIGNAL_H
 #if defined(SIGPIPE) && defined(SIG_IGN)
        signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE in standalone mode so
@@ -1605,6 +1603,8 @@
        tsrm_ls = ts_resource(0);
 #endif

+       fcgi_init();
+
        sapi_startup(&cgi_sapi_module);
        cgi_sapi_module.php_ini_path_override = NULL;
        cgi_sapi_module.php_ini_ignore_cwd = 1;

Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_main.c   2011-06-22 21:22:06 UTC (rev 
312388)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_main.c   2011-06-23 00:25:54 UTC (rev 
312389)
@@ -1587,8 +1587,6 @@
        char *fpm_prefix = NULL;
        int test_conf = 0;

-       fcgi_init();
-
 #ifdef HAVE_SIGNAL_H
 #if defined(SIGPIPE) && defined(SIG_IGN)
        signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE in standalone mode so
@@ -1605,6 +1603,8 @@
        tsrm_ls = ts_resource(0);
 #endif

+       fcgi_init();
+
        sapi_startup(&cgi_sapi_module);
        cgi_sapi_module.php_ini_path_override = NULL;
        cgi_sapi_module.php_ini_ignore_cwd = 1;

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

Reply via email to