diff options
| author | Julien Pauli <jpauli@php.net> | 2016-07-12 10:38:22 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2016-07-12 10:38:22 +0200 |
| commit | 3c356aa7cb6cdb0b4ff00de481a99133fe1896b4 (patch) | |
| tree | b590799ca9dec7057d219039f32ce33ba1aa71db | |
| parent | a8566ee8004ce0fa78a8c52f3573794c1fc44bf3 (diff) | |
| parent | 403f23b4607cfcaa97279217a64b0b38f15a7bb5 (diff) | |
| download | php-git-3c356aa7cb6cdb0b4ff00de481a99133fe1896b4.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Updated NEWS
Fix #72575: using --allow-to-run-as-root should ignore missing user directive
| -rw-r--r-- | sapi/fpm/fpm/fpm_conf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index 9a619ce887..2e5effebc0 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -763,8 +763,8 @@ static int fpm_conf_process_all_pools() /* {{{ */ } } - /* alert if user is not set only if we are not root*/ - if (!wp->config->user && !geteuid()) { + /* alert if user is not set; only if we are root and fpm is not running with --allow-to-run-as-root */ + if (!wp->config->user && !geteuid() && !fpm_globals.run_as_root) { zlog(ZLOG_ALERT, "[pool %s] user has not been defined", wp->config->name); return -1; } |