Browse Source

- Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start)

pull/90/merge
Jerome Loyet 14 years ago
parent
commit
812d248193
  1. 2
      NEWS
  2. 4
      sapi/fpm/fpm/fpm_conf.c

2
NEWS

@ -7,6 +7,8 @@ PHP NEWS
- FPM
. Fixed bug #61045 (fpm don't send error log to fastcgi clients). (fat)
. Fixed bug #61835 (php-fpm is not allowed to run as root). (fat)
. Fixed bug #61295 (php-fpm should not fail with commented 'user'
for non-root start). (fat)
- XML Writer:
. Fixed bug #62064 (memory leak in the XML Writer module).

4
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;
}

Loading…
Cancel
Save