diff options
| author | Michael Wallner <mike@php.net> | 2013-10-21 12:04:06 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2013-10-21 12:04:06 +0200 |
| commit | 41da5376149c53dabb96b23c1281f1bcc7cb9aff (patch) | |
| tree | f8c6e6910288801b0d76447dbfc89550fda0baa4 | |
| parent | aed56fc9a7951e132b016a2deb8c4ede68bb02b4 (diff) | |
| parent | a911fbc80a8e29aa1d58d8e8a86c4fa3f6c7bf92 (diff) | |
| download | php-git-41da5376149c53dabb96b23c1281f1bcc7cb9aff.tar.gz | |
Merge branch 'master' of https://github.com/DylanArnold/php-src
* 'master' of https://github.com/DylanArnold/php-src:
Call php_module_shutdown() for php-fpm child processes
| -rw-r--r-- | sapi/fpm/fpm/fpm_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index 043e0e00a4..4b20e632dd 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -1982,8 +1982,9 @@ fastcgi_request_done: out: SG(server_context) = NULL; + php_module_shutdown(TSRMLS_C); + if (parent) { - php_module_shutdown(TSRMLS_C); sapi_shutdown(); } |