svn: /php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/ fpm_worker_pool.c
| From: | Jérôme Loyet | Date: | Mon, 11 Jan 2010 22:45:36 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/ fpm_worker_pool.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-61528@lists.php.net to get a copy of this message | ||
fat Mon, 11 Jan 2010 22:45:36 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=293434
Log:
bug: don't free shm_status on child cleanup
Changed paths:
U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_worker_pool.c
Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_worker_pool.c
===================================================================
--- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_worker_pool.c 2010-01-11 21:57:56 UTC (rev
293433)
+++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_worker_pool.c 2010-01-11 22:45:36 UTC (rev
293434)
@@ -33,7 +33,7 @@
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);
}
}