mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 18:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jerome Loyet 2012-05-23 11:31:33 +02:00
parent 757e3fc3d5
commit a07d76c0ba
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -57,6 +57,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)
- Libxml:
. Fixed bug #61617 (Libxml tests failed(ht is already destroyed)).

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