diff options
| author | Jérôme Loyet <fat@php.net> | 2010-01-11 22:45:36 +0000 |
|---|---|---|
| committer | Jérôme Loyet <fat@php.net> | 2010-01-11 22:45:36 +0000 |
| commit | 46d6cc1f44682fc5e49970dc8488fdb2fe753441 (patch) | |
| tree | 82c9b5b0e367c80fe010eca653b2f800e523de91 | |
| parent | 449756ef317e311cb0b5cd1eebd008f5bcb66327 (diff) | |
| download | php-git-46d6cc1f44682fc5e49970dc8488fdb2fe753441.tar.gz | |
bug: don't free shm_status on child cleanup
| -rw-r--r-- | sapi/fpm/fpm/fpm_worker_pool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/fpm/fpm/fpm_worker_pool.c b/sapi/fpm/fpm/fpm_worker_pool.c index 368deb6aa0..c16dc64857 100644 --- a/sapi/fpm/fpm/fpm_worker_pool.c +++ b/sapi/fpm/fpm/fpm_worker_pool.c @@ -33,7 +33,7 @@ static void fpm_worker_pool_cleanup(int which, void *arg) /* {{{ */ free(wp->user); free(wp->home); free(wp); - if (wp->shm_status) { + if (wp->shm_status && which != FPM_CLEANUP_CHILD) { fpm_shm_free(wp->shm_status, !fpm_globals.is_child); } } |