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

[Jérôme Loyet]

fat                                      Wed, 10 Nov 2010 23:54:14 +0000

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

Log:
- don't call shutdown functions after child ends softly, let the master process 
call them

Changed paths:
    U   php/php-src/branches/PHP_5_3/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/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c        2010-11-10 
21:34:44 UTC (rev 305261)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c        2010-11-10 
23:54:14 UTC (rev 305262)
@@ -1919,8 +1919,10 @@
 out:

        SG(server_context) = NULL;
-       php_module_shutdown(TSRMLS_C);
-       sapi_shutdown();
+       if (parent) {
+               php_module_shutdown(TSRMLS_C);
+               sapi_shutdown();
+       }

 #ifdef ZTS
        tsrm_shutdown();

Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_main.c   2010-11-10 21:34:44 UTC (rev 
305261)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_main.c   2010-11-10 23:54:14 UTC (rev 
305262)
@@ -1917,8 +1917,10 @@
 out:

        SG(server_context) = NULL;
-       php_module_shutdown(TSRMLS_C);
-       sapi_shutdown();
+       if (parent) {
+               php_module_shutdown(TSRMLS_C);
+               sapi_shutdown();
+       }

 #ifdef ZTS
        tsrm_shutdown();


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