summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorJérôme Loyet <fat@php.net>2010-11-10 23:54:14 +0000
committerJérôme Loyet <fat@php.net>2010-11-10 23:54:14 +0000
commit07abcdc031a1225a6dc875a5f6f8abf5272d702c (patch)
tree293cadaa4287bda4ed20e0ef1dfea0c56fa42fbf /sapi
parentf4b2664e2c8928c397780591a481fbeec4aff918 (diff)
downloadphp-git-07abcdc031a1225a6dc875a5f6f8abf5272d702c.tar.gz
- don't call shutdown functions after child ends softly, let the master process call them
Diffstat (limited to 'sapi')
-rw-r--r--sapi/fpm/fpm/fpm_main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index a1862b559d..1ce4cda0d5 100644
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -1919,8 +1919,10 @@ fastcgi_request_done:
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();