Commit: 812d2481935185eeeabb2c1fe2d7eafd76fc7359 Author: Jerome Loyet <f...@php.net> Wed, 23 May 2012 11:30:27 +0200 Parents: f4c38016b634fbacd6daab6e43d0cd57d1ec5357 Branches: PHP-5.3
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=812d2481935185eeeabb2c1fe2d7eafd76fc7359 Log: - Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start) Bugs: https://bugs.php.net/61295 Changed paths: M NEWS M sapi/fpm/fpm/fpm_conf.c Diff: diff --git a/NEWS b/NEWS index c1d5f61..13ac964 100644 --- a/NEWS +++ b/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). 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; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
