bug: don't free shm_status on child cleanup

Jérôme Loyet · Jérôme Loyet · commit 46d6cc1f4468 · 2010-01-11T22:45:36.000Z
diff --git 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);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ static void fpm_worker_pool_cleanup(int which, void arg) / {{{ */`
`33`	`33`	`free(wp->user);`
`34`	`34`	`free(wp->home);`
`35`	`35`	`free(wp);`
`36`		`- if (wp->shm_status) {`
	`36`	`+ if (wp->shm_status && which != FPM_CLEANUP_CHILD) {`
`37`	`37`	`fpm_shm_free(wp->shm_status, !fpm_globals.is_child);`
`38`	`38`	`}`
`39`	`39`	`}`