summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorJerome Loyet <fat@php.net>2012-05-23 09:30:27 (GMT)
committerJerome Loyet <fat@php.net>2012-05-23 09:30:27 (GMT)
commit812d2481935185eeeabb2c1fe2d7eafd76fc7359 (patch)
treee37c5331f7a092259e02ee57981ebb13a8a9d801 /sapi
parentf4c38016b634fbacd6daab6e43d0cd57d1ec5357 (diff)
downloadphp-812d2481935185eeeabb2c1fe2d7eafd76fc7359.tar.gz
- Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start)
Diffstat (limited to 'sapi')
-rw-r--r--sapi/fpm/fpm/fpm_conf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index 304076d..0b2c5ae 100644
--- a/sapi/fpm/fpm/fpm_conf.c
+++ b/sapi/fpm/fpm/fpm_conf.c
@@ -723,8 +723,8 @@ static int fpm_conf_process_all_pools() /* {{{ */
}
}
- /* user */
- if (!wp->config->user) {
+ /* alert if user is not set only if we are not root*/
+ if (!wp->config->user && !geteuid()) {
zlog(ZLOG_ALERT, "[pool %s] user has not been defined", wp->config->name);
return -1;
}