[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/sapi/fpm/fpm/fpm_main.c trunk/sapi/fpm/fpm/fpm_main.c

[Felipe Pena]

felipe                                   Thu, 23 Jun 2011 00:40:31 +0000

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

Log:
- Fixed crash (take 2)

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-23 
00:25:54 UTC (rev 312389)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_main.c        2011-06-23 
00:40:31 UTC (rev 312390)
@@ -1603,11 +1603,11 @@
        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;
+
+       fcgi_init();

 #ifdef PHP_WIN32
        _fmode = _O_BINARY; /* sets default for file streams to binary */

Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_main.c   2011-06-23 00:25:54 UTC (rev 
312389)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_main.c   2011-06-23 00:40:31 UTC (rev 
312390)
@@ -1603,11 +1603,11 @@
        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;
+
+       fcgi_init();

 #ifdef PHP_WIN32
        _fmode = _O_BINARY; /* sets default for file streams to binary */


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