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

diff --git a/NEWS b/NEWS
index c1d5f618b092991f7efb2aee0fb7fa2b7d748350..13ac964518bf4e81a15c7614a7f5afbf01491994 100644 (file)
--- 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 304076d35eb94bb365f09ce355e310c3971e9408..0b2c5aef5afeb6d82d8b4f034cd9446d2d98d791 100644 (file)
--- 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;
                }