clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.4'

Browse Source 
* PHP-5.4:
  - Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start)
This commit is contained in:
Jerome Loyet 2012-05-23 11:32:02 +02:00
commit 9438b2c401
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sapi/fpm/fpm/fpm_conf.c
View File

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